Tackle mcode_alloc issues once and for all #283
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Which implies renaming our main entry point ;).
(Needs to end in .so)
empty variables laying about ;p
But it works.
It works.
It's a plain array, and order is *very much* important here...
when I'm using the same thing in C without issue... Weird-ass symbol shenanigans with multiple dlopen implementations?
But we're back to the random ffi.load failures (unless the JIT is disabled). The already loaded check doesn't make much sense, either.
pazos
approved these changes
Jan 1, 2021
There was a problem hiding this comment.
@NiLuJe: lgtm
A minor nit is the dummy c file needed to bundle libluajit.so. That could be avoided if we copy libluajit.so to a given path (libs/$(ANDROID_ABI)) and tell gradle to pick external libraries from there.
I think everything related to luajit can be managed from mk-luajit.sh and we can get rid of it in Android.mk.
|
@pazos: This iteration got rid of that ;). (I mean, the source is still there because I left the behavior optional for documentation purposes, but it's commented out and ifdef'ed out ;)). |
|
But, yes, gradle would probably be the place to handle that properly. I just don't know how the hell this thing works ^^. |
Please merge this PR and I can take care of it next. I would merge it myself but I'm not sure if you want to keep the commit history or squash all commits together |
|
Oh, definitely squash ;p. Just have to double-check that the last commit didn't break everything ;p. Spoiler: It did ;p. I've since fixed it, though :). |
We weren't restoring the MCLink metadata
(Fro some reason, I couldn't install the debug build on my N5 -_-").
NiLuJe
added a commit
to NiLuJe/koreader
that referenced
this pull request
Jan 2, 2021
NiLuJe
added a commit
to koreader/koreader
that referenced
this pull request
Jan 2, 2021
* 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)
NiLuJe
added a commit
to NiLuJe/koreader
that referenced
this pull request
Sep 28, 2022
It's been dead code since koreader/android-luajit-launcher#283
NiLuJe
added a commit
to NiLuJe/koreader
that referenced
this pull request
Oct 2, 2022
It's been dead code since koreader/android-luajit-launcher#283
NiLuJe
added a commit
to NiLuJe/koreader
that referenced
this pull request
Oct 3, 2022
It's been dead code since koreader/android-luajit-launcher#283
NiLuJe
added a commit
to NiLuJe/koreader
that referenced
this pull request
Oct 5, 2022
It's been dead code since koreader/android-luajit-launcher#283
NiLuJe
added a commit
to koreader/koreader
that referenced
this pull request
Oct 6, 2022
Basically: * Use `extend` for class definitions * Use `new` for object instantiations That includes some minor code cleanups along the way: * Updated `Widget`'s docs to make the semantics clearer. * Removed `should_restrict_JIT` (it's been dead code since koreader/android-luajit-launcher#283) * Minor refactoring of LuaSettings/LuaData/LuaDefaults/DocSettings to behave (mostly, they are instantiated via `open` instead of `new`) like everything else and handle inheritance properly (i.e., DocSettings is now a proper LuaSettings subclass). * Default to `WidgetContainer` instead of `InputContainer` for stuff that doesn't actually setup key/gesture events. * Ditto for explicit `*Listener` only classes, make sure they're based on `EventListener` instead of something uselessly fancier. * Unless absolutely necessary, do not store references in class objects, ever; only values. Instead, always store references in instances, to avoid both sneaky inheritance issues, and sneaky GC pinning of stale references. * ReaderUI: Fix one such issue with its `active_widgets` array, with critical implications, as it essentially pinned *all* of ReaderUI's modules, including their reference to the `Document` instance (i.e., that was a big-ass leak). * Terminal: Make sure the shell is killed on plugin teardown. * InputText: Fix Home/End/Del physical keys to behave sensibly. * InputContainer/WidgetContainer: If necessary, compute self.dimen at paintTo time (previously, only InputContainers did, which might have had something to do with random widgets unconcerned about input using it as a baseclass instead of WidgetContainer...). * OverlapGroup: Compute self.dimen at *init* time, because for some reason it needs to do that, but do it directly in OverlapGroup instead of going through a weird WidgetContainer method that it was the sole user of. * ReaderCropping: Under no circumstances should a Document instance member (here, self.bbox) risk being `nil`ed! * Kobo: Minor code cleanups.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Okay, ignore the insane commit history, because this went through a lot of experimentation, especially since I found out my old Nexus 5 on 7.1 didn't give a damn about the initial workaround that yielded decent results on Android 10...
Anyway.
This change is