refs qore/issues#4651 fixed a crash in at_exit handlers when initialized from Java

refs qore/issues#4652 fixed a memory leak with subinterpreters when initialized by Python though the qoreloader module

Author: davidnich

CMakeLists.txt

@@ -3,7 +3,7 @@ project(qore-python-module)
 
 set (VERSION_MAJOR 1)
 set (VERSION_MINOR 1)
-set (VERSION_PATCH 5)
+set (VERSION_PATCH 6)
 
 set(PROJECT_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 

docs/mainpage.dox.tmpl

@@ -500,6 +500,13 @@ PythonProgram::setSaveObjectCallback(callback);
 
     @section pythonreleasenotes python Module Release Notes
 
+    @subsection python_1_1_6 python Module Version 1.1.6
+    - fixed a memory leak with subinterpreters when the module is initialized by python through the
+      @ref python_qoreloader_module "qoreloader" module
+      (<a href="https://github.com/qorelanguage/qore/issues/4652">issue 4652</a>)
+    - fixed a crash on exit when %Qore and the python module were initialized from Java
+      (<a href="https://github.com/qorelanguage/qore/issues/4651">issue 4651</a>)
+
     @subsection python_1_1_5 python Module Version 1.1.5
     - updated to support Python 3.11
       (<a href="https://github.com/qorelanguage/qore/issues/4650">issue 4650</a>)

qore-python-module.spec

@@ -5,7 +5,7 @@
 %global user_module_dir %{mydatarootdir}/qore-modules/
 
 Name:           qore-python-module
-Version:        1.1.5
+Version:        1.1.6
 Release:        1
 Summary:        Qorus Integration Engine - Qore Python module
 License:        MIT
@@ -55,6 +55,9 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %{module_dir}
 
 %changelog
+* Tue Dec 6 2022 David Nichols <david@qore.org>
+- updated to version 1.1.6
+
 * Sat Dec 3 2022 David Nichols <david@qore.org>
 - updated to version 1.1.5
 

src/QorePythonProgram.cpp

@@ -377,22 +377,10 @@ void QorePythonProgram::deleteIntern(ExceptionSink* xsink) {
                 // enforce serialization
                 AutoLocker al(py_thr_lck);
 
-                // do not clear and delete the interpreter with Python 3.10+
-#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 10
                 assert(_qore_PyRuntimeGILState_GetThreadState());
                 PyInterpreterState_Clear(interpreter);
             }
             PyInterpreterState_Delete(interpreter);
-#else
-                // for Python 10+, we only delete the interpreter if initialized by Python
-                if (qore_needs_shutdown) {
-                    PyInterpreterState_Clear(interpreter);
-                }
-            }
-            if (qore_needs_shutdown) {
-                PyInterpreterState_Delete(interpreter);
-            }
-#endif
 
             interpreter = nullptr;
             owns_interpreter = false;
@@ -464,7 +452,12 @@ QoreValue QorePythonProgram::eval(ExceptionSink* xsink, const QoreString& source
 void QorePythonProgram::pythonThreadCleanup(void*) {
     int tid = q_gettid();
     //printd(5, "QorePythonProgram::pythonThreadCleanup()\n");
-    AutoLocker al(py_thr_lck);
+
+    // issue #4651: when called when the Qore library and the python module are initialized from Java during static
+    // process destruction, exit handlers may have already destroyed the static objects in this module
+    if (py_thr_lck.trylock()) {
+        return;
+    }
 
     // delete all thread states for the tid
     for (auto& i : py_thr_map) {
@@ -482,6 +475,7 @@ void QorePythonProgram::pythonThreadCleanup(void*) {
         py_global_tid_map.erase(gi);
     }
     //printd(5, "QorePythonProgram::pythonThreadCleanup() done\n");
+    py_thr_lck.unlock();
 }
 
 bool QorePythonProgram::haveGil() {