Skip to content
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.

Sign up for GitHub

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

fix: make PyObject cleanup thread-safe in free-threaded Python and reduce contention #176

Merged
merged 4 commits into from
Dec 5, 2024
Merged

fix: make PyObject cleanup thread-safe in free-threaded Python and reduce contention #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6be74b
Fix a bug in Py Obj cleanup & reduce contention
jmao-denver Nov 26, 2024
159e78e
Remove unneeded code
jmao-denver Nov 27, 2024
5de1fe2
enable the java-to-python tests
jmao-denver Dec 5, 2024
4f7b61c
Revert "enable the java-to-python tests"
jmao-denver Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/main/java/org/jpy/PyObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ public class PyObject implements AutoCloseable {

private static final AtomicReference<Thread> CLEANUP_THREAD = new AtomicReference<>();

private static final boolean CLEANUP_ON_INIT = Boolean.parseBoolean(System.getProperty("PyObject.cleanup_on_init", "true"));

private static final boolean CLEANUP_ON_THREAD = Boolean.parseBoolean(System.getProperty("PyObject.cleanup_on_thread", "true"));

private static void startCleanupThread() {
Expand Down Expand Up @@ -71,9 +69,6 @@ public static int cleanup() {
PyObject(long pointer, boolean fromJNI) {
state = new PyObjectState(pointer);
if (fromJNI) {
if (CLEANUP_ON_INIT) {
REFERENCES.threadSafeCleanup(); // only performs *one* cleanup
}
if (CLEANUP_ON_THREAD) {
// ensures that we've only started after python has been started, and we know there is something to cleanup
startCleanupThread();
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/org/jpy/PyObjectReferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ private Reference<PyObject> asRef(PyObject pyObject) {
/**
* This should *only* be invoked through the proxy, or when we *know* we have the GIL.
*/
public int threadSafeCleanup() {
return threadSafeCleanup(buffer);
}

private int threadSafeCleanup(long[] buffer) {
public synchronized int threadSafeCleanup() {
return PyLib.ensureGil(() -> {
int index = 0;
while (index < buffer.length) {
Expand Down
Loading