/* The list of protocol decoders. */
SRD_PRIV GSList *pd_list = NULL;
+/* srd.c */
+extern GSList *searchpaths;
+
+/* session.c */
extern GSList *sessions;
/* module_sigrokdecode.c */
}
static int get_probes(const struct srd_decoder *d, const char *attr,
- GSList **pl)
+ GSList **pl)
{
PyObject *py_probelist, *py_entry;
struct srd_probe *p;
/* No probes of this type specified. */
return SRD_OK;
- ret = SRD_ERR_PYTHON;
- py_probelist = py_entry = NULL;
-
py_probelist = PyObject_GetAttrString(d->py_dec, attr);
if (!PyList_Check(py_probelist)) {
- srd_err("Protocol decoder %s %s attribute is not "
- "a list.", d->name, attr);
- goto err_out;
+ srd_err("Protocol decoder %s %s attribute is not a list.",
+ d->name, attr);
+ return SRD_ERR_PYTHON;
}
- num_probes = PyList_Size(py_probelist);
- if (num_probes == 0)
+ if ((num_probes = PyList_Size(py_probelist)) == 0)
/* Empty probelist. */
return SRD_OK;
+ ret = SRD_OK;
for (i = 0; i < num_probes; i++) {
py_entry = PyList_GetItem(py_probelist, i);
if (!PyDict_Check(py_entry)) {
srd_err("Protocol decoder %s %s attribute is not "
"a list with dict elements.", d->name, attr);
- goto err_out;
+ ret = SRD_ERR_PYTHON;
+ break;
}
if (!(p = g_try_malloc(sizeof(struct srd_probe)))) {
srd_err("Failed to g_malloc() struct srd_probe.");
ret = SRD_ERR_MALLOC;
- goto err_out;
+ break;
}
- if ((py_dictitem_as_str(py_entry, "id", &p->id)) != SRD_OK)
- goto err_out;
- if ((py_dictitem_as_str(py_entry, "name", &p->name)) != SRD_OK)
- goto err_out;
- if ((py_dictitem_as_str(py_entry, "desc", &p->desc)) != SRD_OK)
- goto err_out;
+ if ((py_dictitem_as_str(py_entry, "id", &p->id)) != SRD_OK) {
+ ret = SRD_ERR_PYTHON;
+ break;
+ }
+ if ((py_dictitem_as_str(py_entry, "name", &p->name)) != SRD_OK) {
+ ret = SRD_ERR_PYTHON;
+ break;
+ }
+ if ((py_dictitem_as_str(py_entry, "desc", &p->desc)) != SRD_OK) {
+ ret = SRD_ERR_PYTHON;
+ break;
+ }
p->order = i;
*pl = g_slist_append(*pl, p);
}
- ret = SRD_OK;
-err_out:
- Py_DecRef(py_entry);
Py_DecRef(py_probelist);
return ret;
if (!module_name)
return SRD_ERR_ARG;
+ if (PyDict_GetItemString(PyImport_GetModuleDict(), module_name)) {
+ /* Module was already imported. */
+ return SRD_OK;
+ }
+
srd_dbg("Loading protocol decoder '%s'.", module_name);
py_basedec = py_method = py_attr = NULL;
return SRD_OK;
}
+static void srd_decoder_load_all_path(char *path)
+{
+ GDir *dir;
+ const gchar *direntry;
+
+ if (!(dir = g_dir_open(path, 0, NULL)))
+ /* Not really fatal */
+ return;
+
+ /* This ignores errors returned by srd_decoder_load(). That
+ * function will have logged the cause, but in any case we
+ * want to continue anyway. */
+ while ((direntry = g_dir_read_name(dir)) != NULL) {
+ /* The directory name is the module name (e.g. "i2c"). */
+ srd_decoder_load(direntry);
+ }
+ g_dir_close(dir);
+
+}
+
/**
* Load all installed protocol decoders.
*
*/
SRD_API int srd_decoder_load_all(void)
{
- GDir *dir;
- GError *error;
- const gchar *direntry;
+ GSList *l;
if (!srd_check_init())
return SRD_ERR;
- if (!(dir = g_dir_open(DECODERS_DIR, 0, &error))) {
- srd_err("Unable to open %s for reading.", DECODERS_DIR);
- return SRD_ERR_DECODERS_DIR;
- }
-
- while ((direntry = g_dir_read_name(dir)) != NULL) {
- /* The directory name is the module name (e.g. "i2c"). */
- srd_decoder_load(direntry);
- }
- g_dir_close(dir);
+ for (l = searchpaths; l; l = l->next)
+ srd_decoder_load_all_path(l->data);
return SRD_OK;
}
dec = l->data;
srd_decoder_unload(dec);
}
+ g_slist_free(pd_list);
+ pd_list = NULL;
return SRD_OK;
}