X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=e3ffb01288015d19e80b8cdba20fb3bdbd222325;hp=a7e582278662b91bd34fea37363cb887257f6176;hb=a90eeee1f0af5213f8e88788d0d2d715fad1d4c6;hpb=4cc0d9fe8d4f0b8d7d92aab6d5d63bf143fbe264 diff --git a/decoder.c b/decoder.c index a7e5822..e3ffb01 100644 --- a/decoder.c +++ b/decoder.c @@ -42,6 +42,8 @@ /* The list of protocol decoders. */ SRD_PRIV GSList *pd_list = NULL; +extern GSList *sessions; + /* module_sigrokdecode.c */ extern SRD_PRIV PyObject *mod_sigrokdecode; @@ -85,7 +87,7 @@ SRD_API struct srd_decoder *srd_decoder_get_by_id(const char *id) } 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; @@ -95,49 +97,50 @@ static int get_probes(const struct srd_decoder *d, const char *attr, /* 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; @@ -217,6 +220,8 @@ static int get_options(struct srd_decoder *d) } g_variant_ref_sink(o->def); d->options = g_slist_append(d->options, o); + g_free(key); + key = NULL; } Py_DecRef(py_keys); Py_DecRef(py_values); @@ -241,13 +246,25 @@ err_out: */ SRD_API int srd_decoder_load(const char *module_name) { - PyObject *py_basedec, *py_method, *py_attr, *py_annlist, *py_ann; + PyObject *py_basedec, *py_method, *py_attr, *py_annlist, *py_ann, \ + *py_bin_classes, *py_bin_class; struct srd_decoder *d; - int alen, ret, i; - char **ann; + int len, ret, i; + char **ann, *bin; struct srd_probe *p; GSList *l; + if (!srd_check_init()) + return SRD_ERR; + + 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; @@ -355,7 +372,7 @@ SRD_API int srd_decoder_load(const char *module_name) if (py_attr_as_str(d->py_dec, "license", &(d->license)) != SRD_OK) goto err_out; - /* Convert class annotation attribute to GSList of **char. */ + /* Convert annotation class attribute to GSList of char **. */ d->annotations = NULL; if (PyObject_HasAttrString(d->py_dec, "annotations")) { py_annlist = PyObject_GetAttrString(d->py_dec, "annotations"); @@ -364,8 +381,8 @@ SRD_API int srd_decoder_load(const char *module_name) "should be a list.", module_name); goto err_out; } - alen = PyList_Size(py_annlist); - for (i = 0; i < alen; i++) { + len = PyList_Size(py_annlist); + for (i = 0; i < len; i++) { py_ann = PyList_GetItem(py_annlist, i); if (!PyList_Check(py_ann) || PyList_Size(py_ann) != 2) { srd_err("Protocol decoder module %s " @@ -381,6 +398,31 @@ SRD_API int srd_decoder_load(const char *module_name) } } + /* Convert binary class to GSList of char *. */ + d->binary = NULL; + if (PyObject_HasAttrString(d->py_dec, "binary")) { + py_bin_classes = PyObject_GetAttrString(d->py_dec, "binary"); + if (!PyTuple_Check(py_bin_classes)) { + srd_err("Protocol decoder module %s binary classes " + "should be a tuple.", module_name); + goto err_out; + } + len = PyTuple_Size(py_bin_classes); + for (i = 0; i < len; i++) { + py_bin_class = PyTuple_GetItem(py_bin_classes, i); + if (!PyUnicode_Check(py_bin_class)) { + srd_err("Protocol decoder module %s binary " + "class should be a string.", module_name); + goto err_out; + } + + if (py_str_as_str(py_bin_class, &bin) != SRD_OK) { + goto err_out; + } + d->binary = g_slist_append(d->binary, bin); + } + } + /* Append it to the list of supported/loaded decoders. */ pd_list = g_slist_append(pd_list, d); @@ -413,6 +455,12 @@ SRD_API char *srd_decoder_doc_get(const struct srd_decoder *dec) PyObject *py_str; char *doc; + if (!srd_check_init()) + return NULL; + + if (!dec) + return NULL; + if (!PyObject_HasAttrString(dec->py_mod, "__doc__")) return NULL; @@ -459,8 +507,15 @@ static void free_probes(GSList *probelist) SRD_API int srd_decoder_unload(struct srd_decoder *dec) { struct srd_decoder_option *o; + struct srd_session *sess; GSList *l; + if (!srd_check_init()) + return SRD_ERR; + + if (!dec) + return SRD_ERR_ARG; + srd_dbg("Unloading protocol decoder '%s'.", dec->name); /* @@ -469,7 +524,10 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec) * stack. A frontend reloading a decoder thus has to restart all * instances, and rebuild the stack. */ - srd_inst_free_all(NULL); + for (l = sessions; l; l = l->next) { + sess = l->data; + srd_inst_free_all(sess, NULL); + } for (l = dec->options; l; l = l->next) { o = l->data; @@ -493,7 +551,7 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec) /* The module itself. */ Py_XDECREF(dec->py_mod); - /* TODO: (g_)free dec itself? */ + g_free(dec); return SRD_OK; } @@ -511,6 +569,9 @@ SRD_API int srd_decoder_load_all(void) GError *error; const gchar *direntry; + 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;