GIL

Author: realybin

unity/native/papi-python/include/PapiData.h

@@ -94,13 +94,20 @@ struct pesapi_scope__
     PyObject* values[SCOPE_FIX_SIZE_VALUES_SIZE];
     uint32_t values_used;
     eastl::vector<PyObject*, eastl::allocator_malloc>* dynamic_alloc_values = nullptr;
+    PyThreadState* tstate = nullptr;
     PyThreadState *prevThreadState = nullptr;
 
     explicit pesapi_scope__(CppObjectMapper* mapper)
     {
-        prevThreadState = PyThreadState_Swap(mapper->threadState);
+        printf("ctor pesapi_scope__, p %p\n", this);
         this->mapper = mapper;
         prev_scope = (pesapi_scope__*)(mapper->getCurrentScope());
+        if (prev_scope == nullptr)
+        {
+            printf("GIL Acquire in pesapi_scope__ ctor\n");
+            tstate = PyThreadState_New(mapper->threadState->interp);
+            prevThreadState = PyThreadState_Swap(tstate);
+        }
         mapper->setCurrentScope(this);
         values_used = 0;
         caught = nullptr;
@@ -154,6 +161,14 @@ struct pesapi_scope__
 
     ~pesapi_scope__()
     {
+        printf("dtor pesapi_scope__, p %p\n", this);
+        if (prev_scope == nullptr)
+        {
+            printf("GIL Release in pesapi_scope__ dtor\n");
+            PyThreadState_Clear(tstate);
+            PyThreadState_Swap(prevThreadState);
+            PyThreadState_Delete(tstate);
+        }
         if (caught)
         {
             caught->~caught_exception_info();
@@ -177,7 +192,6 @@ struct pesapi_scope__
             dynamic_alloc_values = nullptr;
         }
         mapper->setCurrentScope(prev_scope);
-        PyThreadState_Swap(prevThreadState);
     }
 };
 

unity/native/papi-python/source/CppObjectMapperPython.cpp

@@ -970,9 +970,7 @@ void CppObjectMapper::Initialize(PyThreadState *InThreadState)
     if (!threadState) {
         return;
     }
-    
-    auto prevThreadState = PyThreadState_Swap(threadState);
-    
+
     // Ensure __main__ module exists
     PyObject* main_module = PyImport_AddModule("__main__");
     if (!main_module) {
@@ -991,10 +989,9 @@ void CppObjectMapper::Initialize(PyThreadState *InThreadState)
         PyErr_Clear();
         return;
     }
-    
+
     PtrClassDef.TypeId = &PtrClassDef;
     PtrClassDef.ScriptName = "__Pointer";
-    PyThreadState_Swap(prevThreadState);
 }
 
 void CppObjectMapper::Cleanup()
@@ -1041,10 +1038,11 @@ pesapi_env_ref create_py_env()
         free(mapper);
         return nullptr;
     }
-    
+    PyThreadState_Swap(threadState);
     new (mapper) pesapi::pythonimpl::CppObjectMapper();
+
     mapper->Initialize(threadState);
-    
+
     return pesapi::pythonimpl::g_pesapi_ffi.create_env_ref(reinterpret_cast<pesapi_env>(mapper));
 }
 

unity/native/papi-python/source/PapiPythonImpl.cpp

@@ -575,10 +575,6 @@ void pesapi_close_scope(pesapi_scope pscope)
     if (!scope)
     {
         return;
-    }
-    if (scope->prev_scope == nullptr)
-    {
-
     }
     scope->~pesapi_scope__();
     free(scope);