X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=controller.c;h=2bc0a8c61866822e01253d5148fd419e5871c79a;hp=6e6e4356c21365c6eea1c7eae8fb8335537b999e;hb=12243c22bf01506ac3b220bfe38384db9903756c;hpb=ae53d0a5971121e03a07c469e39ff3cfa34a2111

diff --git a/controller.c b/controller.c
index 6e6e435..2bc0a8c 100644
--- a/controller.c
+++ b/controller.c
@@ -57,14 +57,18 @@ extern SRD_PRIV PyTypeObject srd_logic_type;
  * Multiple calls to srd_init(), without calling srd_exit() in between,
  * are not allowed.
  *
+ * @param path Path to an extra directory containing protocol decoders
+ * 		which will be added to the python sys.path, or NULL.
+ *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  *         Upon Python errors, return SRD_ERR_PYTHON. If the sigrok decoders
  *         directory cannot be accessed, return SRD_ERR_DECODERS_DIR.
  *         If not enough memory could be allocated, return SRD_ERR_MALLOC.
  */
-SRD_API int srd_init(void)
+SRD_API int srd_init(char *path)
 {
 	int ret;
+	char *env_path;
 
 	srd_dbg("Initializing libsigrokdecode.");
 
@@ -74,11 +78,28 @@ SRD_API int srd_init(void)
 	/* Initialize the Python interpreter. */
 	Py_Initialize();
 
-	if ((ret = set_modulepath()) != SRD_OK) {
+	/* Installed decoders. */
+	if ((ret = add_modulepath(DECODERS_DIR)) != SRD_OK) {
 		Py_Finalize();
 		return ret;
 	}
 
+	/* Path specified by the user. */
+	if (path) {
+		if ((ret = add_modulepath(path)) != SRD_OK) {
+			Py_Finalize();
+			return ret;
+		}
+	}
+
+	/* Environment variable overrides everything, for debugging. */
+	if ((env_path = getenv("SIGROKDECODE_DIR"))) {
+		if ((ret = add_modulepath(path)) != SRD_OK) {
+			Py_Finalize();
+			return ret;
+		}
+	}
+
 	if ((ret = srd_load_all_decoders()) != SRD_OK) {
 		Py_Finalize();
 		return ret;
@@ -122,40 +143,62 @@ SRD_API int srd_exit(void)
  * Python modules which have the same name as a sigrok protocol decoder in
  * sys.path or in the current working directory.
  *
- * TODO: add path from env var SIGROKDECODE_PATH, config etc
- * TODO: Should take directoryname/path as input.
+ * @param path Path to an extra directory containing protocol decoders
+ * 		which will be added to the python sys.path, or NULL.
  *
- * @return TODO.
+ * @return SRD_OK upon success, a (negative) error code otherwise.
  */
-SRD_API int set_modulepath(void)
+SRD_PRIV int add_modulepath(const char *path)
 {
-	int ret;
-	gchar *path, *s;
-
-#ifdef _WIN32
-	gchar **splitted;
-
-	/*
-	 * On Windows/MinGW, Python's sys.path needs entries of the form
-	 * 'C:\\foo\\bar' instead of '/foo/bar'.
-	 */
-
-	splitted = g_strsplit(DECODERS_DIR, "/", 0);
-	path = g_build_pathv("\\\\", splitted);
-	g_strfreev(splitted);
-#else
-	path = g_strdup(DECODERS_DIR);
-#endif
-
-	/* TODO: Sanity check on 'path' (length, escape special chars, ...). */
-	s = g_strdup_printf("import sys; sys.path.insert(0, r'%s')", path);
-
-	ret = PyRun_SimpleString(s);
-
-	g_free(path);
-	g_free(s);
+	PyObject *py_cur_path, *py_item;
+	GString *new_path;
+	int wc_len, i;
+	wchar_t *wc_new_path;
+	char *item;
+
+	srd_dbg("adding %s to module path", path);
+
+	new_path = g_string_sized_new(256);
+	g_string_assign(new_path, g_strdup(path));
+	py_cur_path = PySys_GetObject("path");
+	for (i = 0; i < PyList_Size(py_cur_path); i++) {
+		g_string_append(new_path, g_strdup(G_SEARCHPATH_SEPARATOR_S));
+		py_item = PyList_GetItem(py_cur_path, i);
+		if (!PyUnicode_Check(py_item))
+			/* Shouldn't happen. */
+			continue;
+		if (py_str_as_str(py_item, &item) != SRD_OK)
+			continue;
+		g_string_append(new_path, item);
+	}
+
+	/* Convert to wide chars. */
+	wc_len = sizeof(wchar_t) * (new_path->len + 1);
+	if (!(wc_new_path = g_try_malloc(wc_len))) {
+		srd_dbg("malloc failed");
+		return SRD_ERR_MALLOC;
+	}
+	mbstowcs(wc_new_path, new_path->str, wc_len);
+	PySys_SetPath(wc_new_path);
+	g_string_free(new_path, TRUE);
+	g_free(wc_new_path);
+
+//#ifdef _WIN32
+//	gchar **splitted;
+//
+//	/*
+//	 * On Windows/MinGW, Python's sys.path needs entries of the form
+//	 * 'C:\\foo\\bar' instead of '/foo/bar'.
+//	 */
+//
+//	splitted = g_strsplit(DECODERS_DIR, "/", 0);
+//	path = g_build_pathv("\\\\", splitted);
+//	g_strfreev(splitted);
+//#else
+//	path = g_strdup(DECODERS_DIR);
+//#endif
 
-	return ret;
+	return SRD_OK;
 }
 
 /**
@@ -289,6 +332,7 @@ static gint compare_probe_id(struct srd_probe *a, char *probe_id)
  * @param probes A GHashTable of probes to set. Key is probe name, value is
  *               the probe number. Samples passed to this instance will be
  *               arranged in this order.
+ *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
 SRD_API int srd_inst_set_probes(struct srd_decoder_inst *di,
@@ -360,6 +404,7 @@ SRD_API int srd_inst_set_probes(struct srd_decoder_inst *di,
  * @param id Decoder 'id' field.
  * @param options GHashtable of options which override the defaults set in
  *                the decoder class.
+ *
  * @return Pointer to a newly allocated struct srd_decoder_inst, or
  *         NULL in case of failure.
  */
@@ -483,7 +528,7 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id)
  *
  * @return Pointer to struct srd_decoder_inst, or NULL if not found.
  */
-SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
 							      PyObject *obj)
 {
 	GSList *l;
@@ -501,7 +546,7 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
 	return di;
 }
 
-SRD_API int srd_inst_start(struct srd_decoder_inst *di, PyObject *args)
+SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args)
 {
 	PyObject *py_name, *py_res;
 	GSList *l;
@@ -550,7 +595,7 @@ SRD_API int srd_inst_start(struct srd_decoder_inst *di, PyObject *args)
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
-SRD_API int srd_inst_decode(uint64_t start_samplenum,
+SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
 				struct srd_decoder_inst *di,
 				uint8_t *inbuf, uint64_t inbuflen)
 {
@@ -602,7 +647,7 @@ SRD_API int srd_inst_decode(uint64_t start_samplenum,
 	return SRD_OK;
 }
 
-SRD_API void srd_inst_free(struct srd_decoder_inst *di)
+SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di)
 {
 	GSList *l;
 	struct srd_pd_output *pdo;
@@ -621,7 +666,7 @@ SRD_API void srd_inst_free(struct srd_decoder_inst *di)
 	g_slist_free(di->pd_output);
 }
 
-SRD_API void srd_inst_free_all(GSList *stack)
+SRD_PRIV void srd_inst_free_all(GSList *stack)
 {
 	GSList *l;
 	struct srd_decoder_inst *di;
@@ -693,7 +738,7 @@ SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t * inbuf,
 }
 
 SRD_API int srd_register_callback(int output_type,
-				  srd_pd_output_callback_t cb, void *data)
+				  srd_pd_output_callback_t cb, void *user_data)
 {
 	struct srd_pd_callback *pd_cb;
 
@@ -706,7 +751,7 @@ SRD_API int srd_register_callback(int output_type,
 
 	pd_cb->output_type = output_type;
 	pd_cb->callback = cb;
-	pd_cb->data = data;
+	pd_cb->user_data = user_data;
 	callbacks = g_slist_append(callbacks, pd_cb);
 
 	return SRD_OK;