Skip to content

LuaJIT on Android fixes#7094

Merged
NiLuJe merged 7 commits into
koreader:masterfrom
NiLuJe:android-luajit-dlopen
Jan 2, 2021
Merged

LuaJIT on Android fixes#7094
NiLuJe merged 7 commits into
koreader:masterfrom
NiLuJe:android-luajit-dlopen

Conversation

@NiLuJe

@NiLuJe NiLuJe commented Dec 31, 2020

Copy link
Copy Markdown
Member

Requires koreader/android-luajit-launcher#283 & koreader/koreader-base#1279

Make it a real boy, i.e.:

  • No longer flag it as should_restrict_JIT
  • Allow disabling the C blitter

Tweak kodev to add a -d, --debug flag to log to catch the extra logging added in debug builds for LuaJIT.


This change is Reviewable

@NiLuJe NiLuJe requested a review from Frenzie as a code owner December 31, 2020 18:23
@Frenzie Frenzie added this to the 2021.01 milestone Dec 31, 2020
Comment thread kodev
Comment on lines +1133 to +1137
if [ -n "${KODEBUG}" ]; then
adb logcat 'KOReader:* ActivityManager:* AndroidRuntime:* DEBUG:* *:F dlopen:* LuaJIT:*'
else
adb logcat 'KOReader:I ActivityManager:* AndroidRuntime:* DEBUG:* *:F'
fi

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You sure the distinction's useful?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

KOReader's own debug output is already fairly verbose, and so is dlopen, so, we probably don't want to bother unsuspecting users with it ;).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unsuspecting users are running kodev run android --no-debug? :-P

@NiLuJe NiLuJe Dec 31, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the other way around, the default is the less verbose version ^^.

e.g., kodev log android vs. kodev log -d android

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right. The impact will be extremely minimal regardless.

NiLuJe added 4 commits January 1, 2021 16:34
(Again ;p).

And allow disabling the C blitter, to put the workaround to the test...
Catches KOReader's debug, as well as (our) dlopen & luajit logging
@NiLuJe NiLuJe force-pushed the android-luajit-dlopen branch from d80f9c3 to 08454d8 Compare January 1, 2021 15:34
@NiLuJe NiLuJe merged commit 5756f1f into koreader:master Jan 2, 2021
0xstillb pushed a commit to 0xstillb/koreader-thai that referenced this pull request May 9, 2026
* Don't flag Android as should_restrict_JIT

And allow disabling the C blitter, to put the workaround to the test...

* Add a -d, --debug flag to the log function

Catches KOReader's debug, as well as (our) dlopen & luajit logging

* Bump android-luajit-launcher

koreader/android-luajit-launcher#283
koreader/android-luajit-launcher#282

* Bump base

(koreader/koreader-base#1279)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants