srd: free all decoder instances when unloading decoders

[libsigrokdecode.git] / decoder.c

diff --git a/decoder.c b/decoder.c
index d29a6d6a9472208673ca0ec27ed03428638d8239..83735a7ec3442ae30a199393b376db0b5a1d6836 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -137,12 +137,12 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
        int alen, ret, i;
        char **ann;
 
-       srd_dbg("srd: loading module '%s'", name);
+       srd_dbg("Loading module '%s'.", name);
 
        py_basedec = py_method = py_attr = NULL;
 
        if (!(d = g_try_malloc0(sizeof(struct srd_decoder)))) {
-               srd_dbg("srd: Failed to malloc struct srd_decoder");
+               srd_dbg("Failed to malloc struct srd_decoder.");
                ret = SRD_ERR_MALLOC;
                goto err_out;
        }
@@ -151,24 +151,20 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 
        /* Import the Python module. */
        if (!(d->py_mod = PyImport_ImportModule(name))) {
-               /* TODO: Report exception message/traceback to err/dbg. */
-               srd_warn("srd: import of '%s' failed.", name);
-               PyErr_Print();
-               PyErr_Clear();
+               catch_exception("import of '%s' failed.", name);
                goto err_out;
        }
 
        /* Get the 'Decoder' class as Python object. */
        if (!(d->py_dec = PyObject_GetAttrString(d->py_mod, "Decoder"))) {
                /* This generated an AttributeError exception. */
-               PyErr_Print();
                PyErr_Clear();
                srd_err("Decoder class not found in protocol decoder %s.", name);
                goto err_out;
        }
 
        if (!(py_basedec = PyObject_GetAttrString(mod_sigrokdecode, "Decoder"))) {
-               srd_dbg("srd: sigrokdecode module not loaded");
+               srd_dbg("sigrokdecode module not loaded.");
                goto err_out;
        }
 
@@ -177,7 +173,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
                                "a subclass of sigrokdecode.Decoder.", name);
                goto err_out;
        }
-       Py_DecRef(py_basedec);
+       Py_CLEAR(py_basedec);
 
        /* Check for a proper start() method. */
        if (!PyObject_HasAttrString(d->py_dec, "start")) {
@@ -191,7 +187,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
                                "is not a method.", name);
                goto err_out;
        }
-       Py_DecRef(py_method);
+       Py_CLEAR(py_method);
 
        /* Check for a proper decode() method. */
        if (!PyObject_HasAttrString(d->py_dec, "decode")) {
@@ -205,7 +201,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
                                "is not a method.", name);
                goto err_out;
        }
-       Py_DecRef(py_method);
+       Py_CLEAR(py_method);
 
        /* If present, options must be a dictionary. */
        if (PyObject_HasAttrString(d->py_dec, "options")) {
@@ -213,6 +209,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
                if (!PyDict_Check(py_attr)) {
                        srd_err("Protocol decoder %s options attribute is not "
                                        "a dictionary.", d->name);
+                       Py_DecRef(py_attr);
                        goto err_out;
                }
                Py_DecRef(py_attr);
@@ -294,7 +291,7 @@ char *srd_decoder_doc(struct srd_decoder *dec)
                return NULL;
 
        if (!(py_str = PyObject_GetAttrString(dec->py_mod, "__doc__"))) {
-               PyErr_Clear();
+               catch_exception("");
                return NULL;
        }
 
@@ -307,16 +304,45 @@ char *srd_decoder_doc(struct srd_decoder *dec)
 }
 
 
+static void free_probes(GSList *probelist)
+{
+       GSList *l;
+       struct srd_probe *p;
+
+       if (probelist == NULL)
+               return;
+
+       for (l = probelist; l; l = l->next) {
+               p = l->data;
+               g_free(p->id);
+               g_free(p->name);
+               g_free(p->desc);
+               g_free(p);
+       }
+       g_slist_free(probelist);
+
+}
+
 /**
  * Unload decoder module.
  *
- * @param dec The decoder struct to be unloaded.
+ * @param dec The struct srd_decoder to be unloaded.
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
  */
 int srd_unload_decoder(struct srd_decoder *dec)
 {
 
+       srd_dbg("unloading decoder %s", dec->name);
+
+       /* Since any instances of this decoder need to be released as well,
+        * but they could be anywhere in the stack, just free the entire
+        * stack. A frontend reloading a decoder thus has to restart all
+        * instances, and rebuild the stack. */
+       srd_instance_free_all(NULL);
+
+       free_probes(dec->probes);
+       free_probes(dec->extra_probes);
        g_free(dec->id);
        g_free(dec->name);
        g_free(dec->longname);
@@ -329,7 +355,9 @@ int srd_unload_decoder(struct srd_decoder *dec)
        if (dec->outputformats != NULL)
                g_slist_free(dec->outputformats);
 
+       /* The module's Decoder class. */
        Py_XDECREF(dec->py_dec);
+       /* The module itself. */
        Py_XDECREF(dec->py_mod);
 
        /* TODO: (g_)free dec itself? */
@@ -354,14 +382,6 @@ int srd_load_all_decoders(void)
                /* The decoder name is the PD directory name (e.g. "i2c"). */
                decodername = g_strdup(direntry);
 
-               /* TODO: Error handling. Use g_try_malloc(). */
-               if (!(dec = malloc(sizeof(struct srd_decoder)))) {
-                       Py_Finalize(); /* Returns void. */
-                       return SRD_ERR_MALLOC;
-               }
-
-               /* Load the decoder. */
-               /* TODO: Warning if loading fails for a decoder. */
                if ((ret = srd_load_decoder(decodername, &dec)) == SRD_OK) {
                        /* Append it to the list of supported/loaded decoders. */
                        pd_list = g_slist_append(pd_list, dec);
@@ -382,7 +402,6 @@ int srd_unload_all_decoders(void)
 
        for (l = srd_list_decoders(); l; l = l->next) {
                dec = l->data;
-               /* TODO: Error handling. */
                srd_unload_decoder(dec);
        }