-
Notifications
You must be signed in to change notification settings - Fork 20
Add isGILEnabled Java method #218
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jmao-denver
wants to merge
2
commits into
jpy-consortium:master
Choose a base branch
from
jmao-denver:217-method-check-gil-enabled
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import unittest | ||
| import sys | ||
|
|
||
| import jpyutil | ||
|
|
||
| jpyutil.init_jvm(jvm_maxmem='512M', jvm_classpath=['target/test-classes', 'target/classes']) | ||
| import jpy | ||
|
|
||
|
|
||
| class TestGIL(unittest.TestCase): | ||
| """ | ||
| Tests for GIL-related functionality in PyLib | ||
| """ | ||
|
|
||
| def setUp(self): | ||
| self.PyLib = jpy.get_type('org.jpy.PyLib') | ||
| self.assertIsNotNone(self.PyLib) | ||
|
|
||
| def test_isGILEnabled(self): | ||
| """ | ||
| Test that PyLib.isGILEnabled() returns the correct GIL status. | ||
| Verifies the JNI implementation matches Python's own sys._is_gil_enabled(). | ||
| """ | ||
| # Get GIL status from Java/JNI | ||
| gil_enabled_from_jni = self.PyLib.isGILEnabled() | ||
| self.assertIsInstance(gil_enabled_from_jni, bool) | ||
|
|
||
| # Get expected GIL status from Python | ||
| # For Python 3.13+ free-threaded builds, check sys._is_gil_enabled() | ||
| # For older versions or standard builds, GIL is always enabled | ||
| if hasattr(sys, '_is_gil_enabled'): | ||
| expected_gil_enabled = sys._is_gil_enabled() | ||
| else: | ||
| # Older Python or standard build - GIL is always enabled | ||
| expected_gil_enabled = True | ||
|
|
||
| # Verify they match | ||
| self.assertEqual( | ||
| gil_enabled_from_jni, | ||
| expected_gil_enabled, | ||
| f"PyLib.isGILEnabled() returned {gil_enabled_from_jni}, " | ||
| f"but Python's sys._is_gil_enabled() indicates {expected_gil_enabled}" | ||
| ) | ||
|
|
||
| def test_isGILEnabled_always_returns_boolean(self): | ||
| """ | ||
| Test that isGILEnabled() always returns a boolean value. | ||
| """ | ||
| result = self.PyLib.isGILEnabled() | ||
| self.assertIsInstance(result, bool) | ||
|
|
||
| def test_isGILEnabled_standard_python(self): | ||
| """ | ||
| Test that for standard Python builds (non-free-threaded), | ||
| isGILEnabled() returns True. | ||
| """ | ||
| # Check if this is a free-threaded build | ||
| is_free_threaded = hasattr(sys, '_is_gil_enabled') | ||
|
|
||
| if not is_free_threaded: | ||
| # For standard Python builds, GIL should always be enabled | ||
| self.assertTrue( | ||
| self.PyLib.isGILEnabled(), | ||
| "GIL should always be enabled in standard Python builds" | ||
| ) | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| print('\nRunning ' + __file__) | ||
| unittest.main() | ||
|
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this is quite true. The documentation at https://docs.python.org/3/library/sys.html#sys._is_gil_enabled says:
In general, I think the
_prefix in a context like this means it's not part of the stable API.I do think we should strive to work with other implementations of Python.
That said, as you mention, it's possible that python doesn't provide a stable way to call this from C API yet.
I think we should at least note we'd prefer to call stable C API here, and create a follow-up in the future (/ link to our issue / link to c python issue).