X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=srd.c;h=22f47fcf26a869ad8856e90b6f7f34bc76be5741;hp=efd1c8ef4275f82840035e2171a5b5ff5710f1ed;hb=0659deb4c36180d33678ff8938168da345293579;hpb=514b2edc54efda9c6698456748c4256bb901eddd

diff --git a/srd.c b/srd.c
index efd1c8e..22f47fc 100644
--- 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,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;
@@ -240,9 +285,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 +314,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 +326,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 +355,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 +393,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;
+}
+
 /** @} */