Make PyGILStateEnsure reentrant

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/pystate.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -97,9 +97,8 @@ PyAPI_FUNC(PyFrameObject*) PyThreadState_GetFrame(PyThreadState *tstate);
 PyAPI_FUNC(uint64_t) PyThreadState_GetID(PyThreadState *tstate);
 #endif
 
-typedef
-    enum {PyGILState_LOCKED, PyGILState_UNLOCKED}
-        PyGILState_STATE;
+/* GraalVM change: we need more state bits */
+typedef int PyGILState_STATE;
 
 
 /* Ensure that the current thread is ready to call the Python

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

@@ -118,13 +118,12 @@ int PyState_RemoveModule(struct PyModuleDef* def) {
 
 // This function has a different implementation on NFI in capi_native.c
 PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure() {
-    int res = GraalPyTruffleGILState_Ensure();
-    return res ? PyGILState_LOCKED : PyGILState_UNLOCKED;
+    return GraalPyTruffleGILState_Ensure();
 }
 
 // This function has a different implementation on NFI in capi_native.c
 PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE state) {
-    if (state == PyGILState_LOCKED) {
+    if (state) {
         GraalPyTruffleGILState_Release();
     }
 }

graalpython/com.oracle.graal.python.jni/src/capi_native.c

@@ -465,15 +465,27 @@ void finalizeCAPI() {
 	GraalPy_set_PyObject_ob_refcnt = nop_GraalPy_set_PyObject_ob_refcnt;
 }
 
+#define _PYGILSTATE_LOCKED   0x1
+#define _PYGILSTATE_ATTACHED 0x2
+
 PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure() {
-    (*TRUFFLE_CONTEXT)->attachCurrentThread(TRUFFLE_CONTEXT);
-    int res = PyTruffleGILState_Ensure();
-    return res ? PyGILState_LOCKED : PyGILState_UNLOCKED;
+    int result = 0;
+    if ((*TRUFFLE_CONTEXT)->getTruffleEnv(TRUFFLE_CONTEXT) == NULL) {
+        (*TRUFFLE_CONTEXT)->attachCurrentThread(TRUFFLE_CONTEXT);
+        result |= _PYGILSTATE_ATTACHED;
+    }
+    int locked = PyTruffleGILState_Ensure();
+    if (locked) {
+        result |= _PYGILSTATE_LOCKED;
+    }
+    return result;
 }
 
 PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE state) {
-    if (state == PyGILState_LOCKED) {
+    if (state & _PYGILSTATE_LOCKED) {
         PyTruffleGILState_Release();
+    }
+    if (state & _PYGILSTATE_ATTACHED) {
         (*TRUFFLE_CONTEXT)->detachCurrentThread(TRUFFLE_CONTEXT);
     }
 }