instance.c: Fix a memory leak reported by scan-build.
[libsigrokdecode.git] / module_sigrokdecode.c
index cb43372932bec4808e9a1cff88dd0252245bb526..ab5df19e3db27cde47cf1cc943a83ccbd4d51aa6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrokdecode project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "sigrokdecode-internal.h"
-#include "config.h"
+#include <config.h>
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 
+/** @cond PRIVATE */
 
-/* When initialized, a reference to this module inside the python interpreter
+/*
+ * When initialized, a reference to this module inside the Python interpreter
  * lives here.
  */
-PyObject *mod_sigrokdecode = NULL;
-
-/* lives in type_logic.c */
-extern PyTypeObject srd_logic_type;
-
-
-static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj,
-               int *ann_format, char ***ann)
-{
-       PyObject *py_tmp;
-       struct srd_pd_output *pdo;
-       int ann_id;
-
-       /* Should be a list of [annotation format, [string, ...]] */
-       if (!PyList_Check(obj) && !PyTuple_Check(obj)) {
-               srd_err("Protocol decoder %s submitted %s instead of list",
-                               di->decoder->name, obj->ob_type->tp_name);
-               return SRD_ERR_PYTHON;
-       }
-
-       /* Should have 2 elements... */
-       if (PyList_Size(obj) != 2) {
-               srd_err("Protocol decoder %s submitted annotation list with %d elements instead of 2",
-                               di->decoder->name, PyList_Size(obj));
-               return SRD_ERR_PYTHON;
-       }
-
-       /* First element should be an integer matching a previously
-        * registered annotation format. */
-       py_tmp = PyList_GetItem(obj, 0);
-       if (!PyLong_Check(py_tmp)) {
-               srd_err("Protocol decoder %s submitted annotation list, but first element was not an integer",
-                               di->decoder->name);
-               return SRD_ERR_PYTHON;
-       }
-
-       ann_id = PyLong_AsLong(py_tmp);
-       if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_id))) {
-               srd_err("Protocol decoder %s submitted data to non-existent annotation format %d",
-                               di->decoder->name, ann_id);
-               return SRD_ERR_PYTHON;
-       }
-       *ann_format = ann_id;
-
-       /* Second element must be a list */
-       py_tmp = PyList_GetItem(obj, 1);
-       if (!PyList_Check(py_tmp)) {
-               srd_err("Protocol decoder %s submitted annotation list, but second element was not a list",
-                               di->decoder->name);
-               return SRD_ERR_PYTHON;
-       }
-       if (py_strlist_to_char(py_tmp, ann) != SRD_OK) {
-               srd_err("Protocol decoder %s submitted annotation list, but second element was malformed",
-                               di->decoder->name);
-               return SRD_ERR_PYTHON;
-       }
+SRD_PRIV PyObject *mod_sigrokdecode = NULL;
 
-       return SRD_OK;
-}
-
-static PyObject *Decoder_put(PyObject *self, PyObject *args)
-{
-       GSList *l;
-       PyObject *data, *py_res;
-       struct srd_decoder_instance *di, *next_di;
-       struct srd_pd_output *pdo;
-       struct srd_proto_data *pdata;
-       uint64_t start_sample, end_sample;
-       int output_id;
-       void (*cb)();
-
-       if (!(di = get_di_by_decobject(self)))
-               return NULL;
-
-       if (!PyArg_ParseTuple(args, "KKiO", &start_sample, &end_sample, &output_id, &data))
-               return NULL;
-
-       if (!(l = g_slist_nth(di->pd_output, output_id))) {
-               srd_err("Protocol decoder %s submitted invalid output ID %d",
-                               di->decoder->name, output_id);
-               return NULL;
-       }
-       pdo = l->data;
-
-       if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data))))
-               return NULL;
-       pdata->start_sample = start_sample;
-       pdata->end_sample = end_sample;
-       pdata->pdo = pdo;
-
-       switch (pdo->output_type) {
-       case SRD_OUTPUT_ANN:
-               /* Annotations are only fed to callbacks. */
-               if ((cb = srd_find_callback(pdo->output_type))) {
-                       /* Annotations need converting from PyObject. */
-                       if (convert_pyobj(di, data, &pdata->ann_format,
-                                       (char ***)&pdata->data) != SRD_OK) {
-                               /* An error was already logged. */
-                               break;
-                       }
-                       cb(pdata);
-               }
-               break;
-       case SRD_OUTPUT_PROTO:
-               for (l = di->next_di; l; l = l->next) {
-                       next_di = l->data;
-                       /* TODO: is this needed? */
-                       Py_XINCREF(next_di->py_instance);
-                       if (!(py_res = PyObject_CallMethod(next_di->py_instance, "decode",
-                                       "KKO", start_sample, end_sample, data))) {
-                               if (PyErr_Occurred())
-                                       PyErr_Print();
-                       }
-                       Py_XDECREF(py_res);
-               }
-               break;
-       case SRD_OUTPUT_BINARY:
-               srd_err("SRD_OUTPUT_BINARY not yet supported");
-               break;
-       default:
-               srd_err("Protocol decoder %s submitted invalid output type %d",
-                               di->decoder->name, pdo->output_type);
-               break;
-       }
-
-       g_free(pdata);
-
-       Py_RETURN_NONE;
-}
-
-
-static PyObject *Decoder_add(PyObject *self, PyObject *args)
-{
-       PyObject *ret;
-       struct srd_decoder_instance *di;
-       char *proto_id;
-       int output_type, pdo_id;
-
-       if (!(di = get_di_by_decobject(self))) {
-               srd_err("%s():%d decoder instance not found", __func__, __LINE__);
-               PyErr_SetString(PyExc_Exception, "decoder instance not found");
-               return NULL;
-       }
-
-       if (!PyArg_ParseTuple(args, "is", &output_type, &proto_id)) {
-               if (PyErr_Occurred())
-                       PyErr_Print();
-               return NULL;
-       }
-
-       pdo_id = pd_add(di, output_type, proto_id);
-       if (pdo_id < 0)
-               Py_RETURN_NONE;
-       else
-               ret = Py_BuildValue("i", pdo_id);
-
-       return ret;
-}
-
-static PyMethodDef no_methods[] = { {NULL, NULL, 0, NULL} };
-static PyMethodDef Decoder_methods[] = {
-       {"put", Decoder_put, METH_VARARGS,
-        "Accepts a dictionary with the following keys: time, duration, data"},
-       {"add", Decoder_add, METH_VARARGS, "Create a new output stream"},
-       {NULL, NULL, 0, NULL}
-};
-
-
-PyTypeObject srd_Decoder_type = {
-       PyVarObject_HEAD_INIT(NULL, 0)
-       .tp_name = "sigrokdecode.Decoder",
-       .tp_basicsize = sizeof(srd_Decoder),
-       .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-       .tp_doc = "Sigrok Decoder base class",
-       .tp_methods = Decoder_methods,
-};
+/** @endcond */
 
 static struct PyModuleDef sigrokdecode_module = {
        PyModuleDef_HEAD_INIT,
        .m_name = "sigrokdecode",
        .m_doc = "sigrokdecode module",
        .m_size = -1,
-       .m_methods = no_methods,
 };
 
+/** @cond PRIVATE */
 PyMODINIT_FUNC PyInit_sigrokdecode(void)
 {
-       PyObject *mod;
-
-       /* tp_new needs to be assigned here for compiler portability */
-       srd_Decoder_type.tp_new = PyType_GenericNew;
-       if (PyType_Ready(&srd_Decoder_type) < 0)
-               return NULL;
+       PyObject *mod, *Decoder_type;
+       PyGILState_STATE gstate;
 
-       srd_logic_type.tp_new = PyType_GenericNew;
-       if (PyType_Ready(&srd_logic_type) < 0)
-               return NULL;
+       gstate = PyGILState_Ensure();
 
        mod = PyModule_Create(&sigrokdecode_module);
-       Py_INCREF(&srd_Decoder_type);
-       if (PyModule_AddObject(mod, "Decoder", (PyObject *)&srd_Decoder_type) == -1)
-               return NULL;
-       Py_INCREF(&srd_logic_type);
-       if (PyModule_AddObject(mod, "srd_logic", (PyObject *)&srd_logic_type) == -1)
-               return NULL;
-
-       /* expose output types as symbols in the sigrokdecode module */
-       if(PyModule_AddObject(mod, "OUTPUT_ANN",
-                       PyLong_FromLong(SRD_OUTPUT_ANN)) == -1)
-               return NULL;
-       if(PyModule_AddObject(mod, "OUTPUT_PROTO",
-                       PyLong_FromLong(SRD_OUTPUT_PROTO)) == -1)
-               return NULL;
-       if(PyModule_AddObject(mod, "OUTPUT_BINARY",
-                       PyLong_FromLong(SRD_OUTPUT_BINARY)) == -1)
-               return NULL;
+       if (!mod)
+               goto err_out;
+
+       Decoder_type = srd_Decoder_type_new();
+       if (!Decoder_type)
+               goto err_out;
+       if (PyModule_AddObject(mod, "Decoder", Decoder_type) < 0)
+               goto err_out;
+
+       /* Expose output types as symbols in the sigrokdecode module */
+       if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) < 0)
+               goto err_out;
+       if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON", SRD_OUTPUT_PYTHON) < 0)
+               goto err_out;
+       if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY", SRD_OUTPUT_BINARY) < 0)
+               goto err_out;
+       if (PyModule_AddIntConstant(mod, "OUTPUT_META", SRD_OUTPUT_META) < 0)
+               goto err_out;
+       /* Expose meta input symbols. */
+       if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE", SRD_CONF_SAMPLERATE) < 0)
+               goto err_out;
 
        mod_sigrokdecode = mod;
 
+       PyGILState_Release(gstate);
+
        return mod;
-}
+err_out:
+       Py_XDECREF(mod);
+       srd_exception_catch("Failed to initialize module");
+       PyGILState_Release(gstate);
 
+       return NULL;
+}
+/** @endcond */