atsha204a: Shorten a few more code chunks, add helpers.

[libsigrokdecode.git] / srd.c

diff --git a/srd.c b/srd.c
index e8fd7513e7b14a3679d4541279d2087045c3c93c..d4ec44beca2a4579d7f3e7054f9095093ce40dd3 100644 (file)
--- a/srd.c
+++ b/srd.c
@@ -105,7 +105,7 @@ static int searchpath_add_xdg_dir(const char *datadir)
        if (g_file_test(decdir, G_FILE_TEST_IS_DIR))
                ret = srd_decoder_searchpath_add(decdir);
        else
-               ret = SRD_OK; /* just ignore non-existing directory */
+               ret = SRD_OK; /* Just ignore non-existing directory. */
 
        g_free(decdir);
 
@@ -144,6 +144,50 @@ static void print_versions(void)
        g_free(str);
 }
 
+static int print_searchpaths(void)
+{
+       PyObject *py_paths, *py_path, *py_bytes;
+       PyGILState_STATE gstate;
+       GString *s;
+       GSList *l;
+       int i;
+
+       s = g_string_sized_new(500);
+       g_string_append(s, "Protocol decoder search paths:\n");
+       for (l = searchpaths; l; l = l->next)
+               g_string_append_printf(s, " - %s\n", (const char *)l->data);
+       s->str[s->len - 1] = '\0';
+       srd_dbg("%s", s->str);
+       g_string_free(s, TRUE);
+
+       gstate = PyGILState_Ensure();
+
+       py_paths = PySys_GetObject("path");
+       if (!py_paths)
+               goto err;
+
+       s = g_string_sized_new(500);
+       g_string_append(s, "Python system search paths:\n");
+       for (i = 0; i < PyList_Size(py_paths); i++) {
+               py_path = PyList_GetItem(py_paths, i);
+               py_bytes = PyUnicode_AsUTF8String(py_path);
+               g_string_append_printf(s, " - %s\n", PyBytes_AsString(py_bytes));
+       }
+       s->str[s->len - 1] = '\0';
+       srd_dbg("%s", s->str);
+       g_string_free(s, TRUE);
+
+       PyGILState_Release(gstate);
+
+       return SRD_OK;
+
+err:
+       srd_err("Unable to query Python system search paths.");
+       PyGILState_Release(gstate);
+
+       return SRD_ERR_PYTHON;
+}
+
 /**
  * Initialize libsigrokdecode.
  *
@@ -196,7 +240,7 @@ SRD_API int srd_init(const char *path)
        /* Locations relative to the XDG system data directories. */
        sys_datadirs = g_get_system_data_dirs();
        for (i = g_strv_length((char **)sys_datadirs); i > 0; i--) {
-               ret = searchpath_add_xdg_dir(sys_datadirs[i-1]);
+               ret = searchpath_add_xdg_dir(sys_datadirs[i - 1]);
                if (ret != SRD_OK) {
                        Py_Finalize();
                        return ret;
@@ -232,8 +276,16 @@ 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;
 
+       print_searchpaths();
+
        return SRD_OK;
 }
 
@@ -261,9 +313,18 @@ 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.
+        */
+       if (Py_IsInitialized())
+               (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 +352,50 @@ 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;
+}
+
+/**
+ * Return the list of protocol decoder search paths.
+ *
+ * @return The list of search paths used when loading protocol decoders.
+ *
+ * @since 0.5.1
+ */
+SRD_API GSList *srd_searchpaths_get(void)
+{
+       return g_slist_copy_deep(searchpaths, (GCopyFunc)g_strdup, NULL);
 }
 
 /** @} */