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 leaking attributes in java PyObject. #539

Merged
merged 2 commits into from
Jul 29, 2024
Merged

Fix leaking attributes in java PyObject. #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5701119
Fix leaking attributes in java PyObject.
bsteffensmeier Jun 17, 2024
7462705
JPyObject cleanup: check for leaks in equals and consistently XDECREF…
bsteffensmeier Jul 13, 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
1 change: 1 addition & 0 deletions src/main/c/Jep/python/jep_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ JNIEXPORT void JNICALL Java_jep_python_PyObject_setAttr
}

EXIT:
Py_XDECREF(pyAttr);
PyEval_ReleaseThread(jepThread->tstate);
release_utf_char(env, str, attrName);
}
Expand Down
32 changes: 32 additions & 0 deletions src/test/java/jep/test/TestGetJPyObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.lang.reflect.UndeclaredThrowableException;
import java.util.Arrays;
import java.util.Deque;
import java.util.concurrent.atomic.AtomicInteger;

import jep.Interpreter;
import jep.JepException;
Expand Down Expand Up @@ -113,6 +114,36 @@ public static void testSetAttr(Interpreter interp) throws JepException {
}
}

public static void testRefCount(Interpreter interp) throws JepException {
AtomicInteger delCount = new AtomicInteger();
interp.set("delCount", delCount);
interp.exec("class Simple:\n" +
" def __del__(self):\n" +
" delCount.getAndIncrement()"
);
PyCallable simple = interp.getValue("Simple", PyCallable.class);
/* Check for leaks in setAttr() */
PyObject obj1 = simple.callAs(PyObject.class);
PyObject obj2 = simple.callAs(PyObject.class);
obj1.setAttr("member", obj2);
obj2.close();
obj1.close();
/* When a PyObject is deleted any attributes without other references should also be deleted. */
if (delCount.get() != 2) {
throw new IllegalStateException("Expecting 2 deletions but got " + delCount.get());
}
delCount.set(0);
/* Check for leaks in equals() */
obj1 = simple.callAs(PyObject.class);
obj2 = simple.callAs(PyObject.class);
obj1.equals(obj2);
obj2.close();
obj1.close();
if (delCount.get() != 2) {
throw new IllegalStateException("Expecting 2 deletions but got " + delCount.get());
}
}

public static void testDelAttr(Interpreter interp) throws JepException {
interp.eval(buildTestClassPython());
interp.eval("t = testclass(1, 'A String', None)");
Expand Down Expand Up @@ -402,6 +433,7 @@ public static void main(String[] args) throws Exception {
testIdentity(interp);
testGetAttr(interp);
testSetAttr(interp);
testRefCount(interp);
testDelAttr(interp);
testJPyCallable(interp);
testToString(interp);
Expand Down