Refactor JNI lifecycle and log formatting into reusable helpers#176
Merged
Conversation
Pulls log_level_name() and a deterministic format_log_as_json(level, text, ts) out of jllama.cpp into a new pure header with zero JNI/llama dependencies. Adds 13 GoogleTest cases covering level mapping, JSON shape, null text, and explicit timestamp handling. https://claude.ai/code/session_01TBELeBieKqvMwp1Ez8HgSk
Replaces four identical lock_guard + readers.erase() pairs in jllama.cpp (releaseTask, receiveCompletionJson x2, cancelCompletion) with a single inline helper in jni_helpers.hpp. Adds 3 unit tests covering present, missing, and selective-id removal. https://claude.ai/code/session_01TBELeBieKqvMwp1Ez8HgSk
Replaces two identical 'if (!jctx->params.embedding) ThrowNew(...) return' blocks in embed() and handleEmbeddings() with a single helper in jni_helpers.hpp. Adds 2 unit tests using the existing mock JNI fixture. https://claude.ai/code/session_01TBELeBieKqvMwp1Ez8HgSk
Replaces 14 hand-written NewGlobalRef + 7 GetStaticObjectField + 7 NewGlobalRef + 21 DeleteGlobalRef calls with iteration over three small tables: g_global_class_refs, g_global_object_refs, g_static_object_bindings. Adding a new global ref is now a single-line table edit instead of touching four separate places. https://claude.ai/code/session_01TBELeBieKqvMwp1Ez8HgSk
bernardladenthin
had a problem deploying
to
startgate
GitHub Actions
Error
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
format_log_as_json,log_level_name) into a newlog_helpers.hppheader for reusability and testabilityJNI_OnLoadandJNI_OnUnload, eliminating repetitive boilerplateerase_reader()andrequire_embedding_support()tojni_helpers.hppto reduce code duplication across JNI entry pointslog_callback_trampolineto accept explicit timestamp parameter for deterministic testingTest plan
log_helpers.hpp(test_log_helpers.cpp) covering all log levels, null handling, and JSON structureerase_reader()andrequire_embedding_support()helpers intest_jni_helpers.cppRelated issues / PRs
None
Checklist
CONTRIBUTING.mdandCODE_OF_CONDUCT.mdhttps://claude.ai/code/session_01TBELeBieKqvMwp1Ez8HgSk