[GR-58703][GR-58704] Preserve capsule name identity

PullRequest: graalpython/3501

Author: msimacek

docs/user/Python-Runtime.md

@@ -91,8 +91,6 @@ Alternatively, you can download a compressed GraalPy installation file from [Git
 1. Find the download that matches the pattern _graalpy-XX.Y.Z-linux-amd64.tar.gz_ or _graalpy-XX.Y.Z-linux-aarch64.tar.gz_ (depending on your platform) and download.
 2. Uncompress the file and update your `PATH` environment variable to include to the _graalpy-XX.Y.Z-linux-amd64/bin_ (or _graalpy-XX.Y.Z-linux-aarch64/bin_) directory.
 
-> Note: On Oracle Linux 9, additionally install the [`libxcrypt` library](https://github.com/besser82/libxcrypt) that is required for the GraalPy native runtime: `yum install libxcrypt-compat`.
-
 ### macOS
 
 The easiest way to install GraalPy on macOS is to use [Pyenv](https://github.com/pyenv/pyenv) (the Python version manager).

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

@@ -321,7 +321,7 @@ PY_TRUFFLE_TYPE_WITH_ITEMSIZE(PyLong_Type,       "int",                        &
 PY_TRUFFLE_TYPE(PyBool_Type,                     "bool",                       &PyType_Type, sizeof(struct _longobject)) \
 PY_TRUFFLE_TYPE(PyByteArray_Type,                "bytearray",                  &PyType_Type, sizeof(PyByteArrayObject)) \
 PY_TRUFFLE_TYPE_WITH_ITEMSIZE(PyBytes_Type,      "bytes",                      &PyType_Type, PyBytesObject_SIZE, sizeof(char)) \
-PY_TRUFFLE_TYPE_WITH_ALLOC(PyCapsule_Type,       "capsule",                    &PyType_Type, sizeof(PyCapsule), PyType_GenericAlloc, capsule_dealloc, PyObject_Del) \
+PY_TRUFFLE_TYPE_WITH_ALLOC(PyCapsule_Type,       "PyCapsule",                  &PyType_Type, sizeof(PyCapsule), PyType_GenericAlloc, capsule_dealloc, PyObject_Del) \
 PY_TRUFFLE_TYPE(PyCell_Type,                     "cell",                       &PyType_Type, sizeof(PyCellObject)) \
 PY_TRUFFLE_TYPE(PyCMethod_Type,                  "builtin_method",             &PyCFunction_Type, sizeof(PyCFunctionObject)) \
 PY_TRUFFLE_TYPE(PyCode_Type,                     "code",                       &PyType_Type, sizeof(PyTypeObject)) \

graalpython/com.oracle.graal.python.test.integration/pom.xml

@@ -181,7 +181,7 @@ Additionally, one can change the polyglot artifacts version with
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
         </dependency>
     </dependencies>
 </project>

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_capsule.py

@@ -80,6 +80,43 @@ class TestPyCapsule(CPyExtTestCase):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PyCapsule_GetName = CPyExtFunction(
+        lambda args: True,
+        lambda: (
+            ("hello",),
+        ),
+        # Test that the returned name is pointer-identical, pybind11 relies on that
+        code='''int wrap_PyCapsule_Check(char * name) {
+            PyObject* capsule = PyCapsule_New((void *)1, name, NULL);
+            return PyCapsule_GetName(capsule) == name;
+        }
+        ''',
+        resultspec="i",
+        argspec='s',
+        arguments=["char* name"],
+        callfunction="wrap_PyCapsule_Check",
+        cmpfunc=unhandled_error_compare
+    )
+
+    test_PyCapsule_SetName = CPyExtFunction(
+        lambda args: True,
+        lambda: (
+            ("hello",),
+        ),
+        # Test that the returned name is pointer-identical, pybind11 relies on that
+        code='''int wrap_PyCapsule_Check(char * name) {
+            PyObject* capsule = PyCapsule_New((void *)1, NULL, NULL);
+            PyCapsule_SetName(capsule, name);
+            return PyCapsule_GetName(capsule) == name;
+        }
+        ''',
+        resultspec="i",
+        argspec='s',
+        arguments=["char* name"],
+        callfunction="wrap_PyCapsule_Check",
+        cmpfunc=unhandled_error_compare
+    )
+
     test_PyCapsule_GetContext = CPyExtFunction(
         lambda args: True,
         lambda: (

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_cmd_line.txt

@@ -18,7 +18,6 @@
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_site_flag
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_stdin_readline
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_unbuffered_input
-*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_unbuffered_output
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_unmached_quote
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_usage
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_verbose

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -548,7 +548,7 @@ public enum PythonBuiltinClassType implements TruffleObject {
     // CPython uses separate keys, values, items python types for the iterators.
     ContextIterator("context_iterator", J__CONTEXTVARS, Flags.PUBLIC_DERIVED_WODICT),
 
-    Capsule("capsule"),
+    Capsule("PyCapsule"),
 
     PTokenizerIter("TokenizerIter", "_tokenize"),
 

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

@@ -43,6 +43,7 @@
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -133,6 +134,7 @@
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.ThreadLocalAction;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -2571,8 +2573,30 @@ public abstract static class ExitNode extends PythonUnaryBuiltinNode {
         @TruffleBoundary
         @Specialization
         Object exit(int status) {
-            // TODO: use a safepoint action to throw this exception to all running threads
-            throw new PythonExitException(this, status);
+            PythonContext context = getContext();
+            if (context.getOption(PythonOptions.RunViaLauncher)) {
+                Runtime.getRuntime().halt(status);
+            }
+            List<Thread> otherThreads = new ArrayList<>(Arrays.asList(context.getThreads()));
+            otherThreads.remove(context.getMainThread());
+            otherThreads.remove(Thread.currentThread());
+            context.getEnv().submitThreadLocal(otherThreads.toArray(new Thread[0]), new ThreadLocalAction(true, false) {
+                @Override
+                protected void perform(Access access) {
+                    throw new ThreadDeath();
+                }
+            });
+            if (Thread.currentThread() == context.getMainThread()) {
+                throw new PythonExitException(this, status);
+            } else {
+                context.getEnv().submitThreadLocal(new Thread[]{context.getMainThread()}, new ThreadLocalAction(true, false) {
+                    @Override
+                    protected void perform(Access access) {
+                        throw new PythonExitException(ExitNode.this, status);
+                    }
+                });
+            }
+            throw new ThreadDeath();
         }
     }