X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=srd.c;h=efd1c8ef4275f82840035e2171a5b5ff5710f1ed;hb=8a9f60b1a24de32bb4170b927637655ef19de77b;hp=e8fd7513e7b14a3679d4541279d2087045c3c93c;hpb=cdb49509e85443129f2d60180eb818813030901e;p=libsigrokdecode.git

diff --git a/srd.c b/srd.c
index e8fd751..efd1c8e 100644
--- 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;
 }
 
 /** @} */