X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=srd.c;h=35ec5f2e9b7761f8847d957affd0935b2ed39677;hb=6300d97ea67e10ecb645e43f80d445543e05ce00;hp=efd1c8ef4275f82840035e2171a5b5ff5710f1ed;hpb=514b2edc54efda9c6698456748c4256bb901eddd;p=libsigrokdecode.git
diff --git a/srd.c b/srd.c
index efd1c8e..35ec5f2 100644
--- a/srd.c
+++ b/srd.c
@@ -67,8 +67,8 @@ extern SRD_PRIV int max_session_id;
* @section sec_irc IRC
*
* You can find the sigrok developers in the
- * \#sigrok
- * IRC channel on Freenode.
+ * \#sigrok
+ * IRC channel on Libera.Chat.
*
* @section sec_website Website
*
@@ -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,51 @@ 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));
+ Py_DECREF(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 +241,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;
@@ -225,12 +270,37 @@ SRD_API int srd_init(const char *path)
}
/* Environment variable overrides everything, for debugging. */
+ /*
+ * TODO
+ * Is the comment still applicable and correct or up to date?
+ * This implementation adds paths which were specified by the
+ * env var. Which can shadow files in other locations, or can
+ * extend the set of available decoders. Which need not only
+ * serve for development, it is as beneficial to regular users.
+ * Without shadowing all other files still are found.
+ */
if ((env_path = g_getenv("SIGROKDECODE_DIR"))) {
if ((ret = srd_decoder_searchpath_add(env_path)) != SRD_OK) {
Py_Finalize();
return ret;
}
}
+ env_path = g_getenv("SIGROKDECODE_PATH");
+ if (env_path) {
+ char **dir_list, **dir_iter, *dir_item;
+ dir_list = g_strsplit(env_path, G_SEARCHPATH_SEPARATOR_S, 0);
+ for (dir_iter = dir_list; *dir_iter; dir_iter++) {
+ dir_item = *dir_iter;
+ if (!dir_item || !*dir_item)
+ continue;
+ ret = srd_decoder_searchpath_add(dir_item);
+ if (ret != SRD_OK) {
+ Py_Finalize();
+ return ret;
+ }
+ }
+ g_strfreev(dir_list);
+ }
/* Initialize the Python GIL (this also happens to acquire it). */
PyEval_InitThreads();
@@ -240,9 +310,17 @@ SRD_API int srd_init(const char *path)
max_session_id = 0;
+ print_searchpaths();
+
return SRD_OK;
}
+static void srd_session_destroy_cb(void *arg, void *ignored)
+{
+ (void)ignored; // Prevent unused warning
+ srd_session_destroy((struct srd_session *)arg);
+}
+
/**
* Shutdown libsigrokdecode.
*
@@ -261,7 +339,9 @@ SRD_API int srd_exit(void)
{
srd_dbg("Exiting libsigrokdecode.");
- g_slist_foreach(sessions, (GFunc)srd_session_destroy, NULL);
+ g_slist_foreach(sessions, srd_session_destroy_cb, NULL);
+ g_slist_free(sessions);
+ sessions = NULL;
srd_decoder_unload_all();
g_slist_free_full(searchpaths, g_free);
@@ -271,7 +351,8 @@ SRD_API int srd_exit(void)
* Acquire the GIL, otherwise Py_Finalize() might have issues.
* Ignore the return value, we don't need it here.
*/
- (void)PyGILState_Ensure();
+ if (Py_IsInitialized())
+ (void)PyGILState_Ensure();
/* Py_Finalize() returns void, any finalization errors are ignored. */
Py_Finalize();
@@ -299,8 +380,6 @@ SRD_API int srd_exit(void)
* @return SRD_OK upon success, a (negative) error code otherwise.
*
* @private
- *
- * @since 0.1.0
*/
SRD_PRIV int srd_decoder_searchpath_add(const char *path)
{
@@ -339,4 +418,21 @@ err:
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)
+{
+ GSList *paths = NULL;
+
+ for (GSList *l = searchpaths; l; l = l->next)
+ paths = g_slist_append(paths, g_strdup(l->data));
+
+ return paths;
+}
+
/** @} */