add Py_AtExit, PyWeakref_NewRef, PyWeakref_GetObject

Author: timfel

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -334,6 +334,11 @@ Py_ssize_t get_tp_dictoffset(PyTypeObject* obj) {
 	return obj->tp_dictoffset;
 }
 
+/** to be used from Java code only; reads native 'tp_weaklistoffset' field */
+Py_ssize_t get_tp_weaklistoffset(PyTypeObject* obj) {
+	return obj->tp_weaklistoffset;
+}
+
 /** to be used from Java code only; reads native 'tp_itemsize' field */
 Py_ssize_t get_tp_itemsize(PyTypeObject* obj) {
 	return obj->tp_itemsize;

graalpython/com.oracle.graal.python.cext/src/pylifecycle.c

@@ -56,3 +56,10 @@ int PyOS_InterruptOccurred(void) {
 	PyErr_SetString(PyExc_SystemError, "'PyOS_InterruptOccurred' not implemented");
 	return -1;
 }
+
+typedef void (*py_atexit_fun_t)(void (*func)(void));
+UPCALL_TYPED_ID(Py_AtExit, py_atexit_fun_t);
+int Py_AtExit(void (*func)(void)) {
+    _jls_Py_AtExit(func);
+	return 0;
+}

graalpython/com.oracle.graal.python.cext/src/weakrefobject.c

@@ -47,3 +47,21 @@ PyTypeObject _PyWeakref_CallableProxyType = PY_TRUFFLE_TYPE("weakcallableproxy",
 void PyObject_ClearWeakRefs(PyObject *object) {
 	// TODO: implement
 }
+
+void *PY_WEAKREF_MODULE;
+__attribute__((constructor (__COUNTER__)))
+static void initialize_upcall_functions() {
+    PY_WEAKREF_MODULE = (void*)polyglot_eval("python", "import _weakref\n_weakref");
+}
+
+PyObject *PyWeakref_NewRef(PyObject *object, PyObject *callback) {
+    if (callback == NULL) {
+        return UPCALL_O(PY_WEAKREF_MODULE, polyglot_from_string("ReferenceType", SRC_CS), native_to_java(object));
+    } else {
+        return UPCALL_O(PY_WEAKREF_MODULE, polyglot_from_string("ReferenceType", SRC_CS), native_to_java(object), native_to_java(callback));
+    }
+}
+
+PyObject *PyWeakref_GetObject(PyObject *ref) {
+    return UPCALL_O(native_to_java(ref), polyglot_from_string("__call__", SRC_CS));
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -252,6 +252,7 @@
 import com.oracle.graal.python.util.BufferFormat;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
+import com.oracle.graal.python.util.ShutdownHook;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -4176,4 +4177,25 @@ int doGeneric(Object ptrObject) {
             return 0;
         }
     }
+
+    // directly called without landing function
+    @Builtin(name = "Py_AtExit", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class PyAtExit extends PythonUnaryBuiltinNode {
+
+        @Specialization
+        @TruffleBoundary
+        int doGeneric(Object funcPtr) {
+            getContext().registerAtexitHook(new ShutdownHook(){
+                public void call(@SuppressWarnings("unused") PythonContext context) {
+                    try {
+                        InteropLibrary.getUncached().execute(funcPtr);
+                    } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
+                        // ignored
+                    }
+                }
+            });
+            return 0;
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java

@@ -117,6 +117,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_GET_TP_FLAGS("get_tp_flags"),
     FUN_GET_TP_SUBCLASSES("get_tp_subclasses"),
     FUN_GET_TP_DICTOFFSET("get_tp_dictoffset"),
+    FUN_GET_TP_WEAKLISTOFFSET("get_tp_weaklistoffset"),
     FUN_GET_TP_BASICSIZE("get_tp_basicsize"),
     FUN_GET_TP_ITEMSIZE("get_tp_itemsize"),
     FUN_GET_TP_AS_BUFFER("get_tp_as_buffer"),