Acquire/release the Python GIL where needed to avoid threading issues.

[libsigrokdecode.git] / srd.c

diff --git a/srd.c b/srd.c
index e8fd7513e7b14a3679d4541279d2087045c3c93c..efd1c8ef4275f82840035e2171a5b5ff5710f1ed 100644 (file)
--- a/srd.c
+++ b/srd.c
@@ -232,6 +232,12 @@ SRD_API int srd_init(const char *path)
                }
        }
 
+       /* Initialize the Python GIL (this also happens to acquire it). */
+       PyEval_InitThreads();
+
+       /* Release the GIL (ignore return value, we don't need it here). */
+       (void)PyEval_SaveThread();
+
        max_session_id = 0;
 
        return SRD_OK;
@@ -261,9 +267,17 @@ SRD_API int srd_exit(void)
        g_slist_free_full(searchpaths, g_free);
        searchpaths = NULL;
 
+       /*
+        * Acquire the GIL, otherwise Py_Finalize() might have issues.
+        * Ignore the return value, we don't need it here.
+        */
+       (void)PyGILState_Ensure();
+
        /* Py_Finalize() returns void, any finalization errors are ignored. */
        Py_Finalize();
 
+       /* Note: No need to release the GIL since Python is shut down now. */
+
        max_session_id = -1;
 
        return SRD_OK;
@@ -291,28 +305,38 @@ SRD_API int srd_exit(void)
 SRD_PRIV int srd_decoder_searchpath_add(const char *path)
 {
        PyObject *py_cur_path, *py_item;
+       PyGILState_STATE gstate;
 
        srd_dbg("Adding '%s' to module path.", path);
 
+       gstate = PyGILState_Ensure();
+
        py_cur_path = PySys_GetObject("path");
        if (!py_cur_path)
-               return SRD_ERR_PYTHON;
+               goto err;
 
        py_item = PyUnicode_FromString(path);
        if (!py_item) {
                srd_exception_catch("Failed to create Unicode object");
-               return SRD_ERR_PYTHON;
+               goto err;
        }
        if (PyList_Insert(py_cur_path, 0, py_item) < 0) {
                srd_exception_catch("Failed to insert path element");
                Py_DECREF(py_item);
-               return SRD_ERR_PYTHON;
+               goto err;
        }
        Py_DECREF(py_item);
 
+       PyGILState_Release(gstate);
+
        searchpaths = g_slist_prepend(searchpaths, g_strdup(path));
 
        return SRD_OK;
+
+err:
+       PyGILState_Release(gstate);
+
+       return SRD_ERR_PYTHON;
 }
 
 /** @} */