X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decode.c;h=398a9f73c5e9ba4f24f7e66f8879745cf71b6a52;hp=5ff6415bdf6df8fcb7cae442c9c7b043a1a9b787;hb=74911b4c1f6d184dac878d94992d480af0564734;hpb=922763abc279fc5d4e0ed93ed6c6bebbf68d7baf diff --git a/decode.c b/decode.c index 5ff6415..398a9f7 100644 --- a/decode.c +++ b/decode.c @@ -51,58 +51,24 @@ static int srd_load_decoder(const char *name, struct srd_decoder **dec); static int _unitsize = 1; -static PyObject* -emb_getmeta(PyObject *self, PyObject *args) -{ - if (!PyArg_ParseTuple(args, ":get")) - return NULL; - - return Py_BuildValue("{sssisd}", - "driver", "demo", - "unitsize", _unitsize, - "starttime", 129318231823.0 //TODO: Fill with something reasonable. - ); -} - -#if 0 -static PyObject* -emb_get(PyObject *self, PyObject *args) -{ - PyObject *r; - if (!PyArg_ParseTuple(args, ":get")) - return NULL; - - fprintf(stderr, "get called, returns %d\n", _bufoffset); - if ((_bufoffset + _unitsize) <= _buflen) { - r = Py_BuildValue("{sisiss#}", - "time", _bufoffset / _unitsize, - "duration", 10, - "data", &_buf[_bufoffset], _unitsize - ); - _bufoffset += _unitsize; - return r; - } - Py_RETURN_NONE; -} -#endif - static PyObject* emb_put(PyObject *self, PyObject *args) { PyObject *arg; + (void)self; + if (!PyArg_ParseTuple(args, "O:put", &arg)) return NULL; - fprintf(stderr, "put called, got passed %d\n", arg); + fprintf(stdout, "sigrok.put() called by decoder:\n"); + PyObject_Print(arg, stdout, Py_PRINT_RAW); + puts(""); + Py_RETURN_NONE; } static PyMethodDef EmbMethods[] = { - {"get_meta", emb_getmeta, METH_VARARGS, - "Returns information about the stream."}, - /*{"get", emb_get, METH_VARARGS, - "Returns a dictionary with the following keys: time, duration, data"},*/ {"put", emb_put, METH_VARARGS, "Accepts a dictionary with the following keys: time, duration, data"}, {NULL, NULL, 0, NULL} @@ -147,9 +113,11 @@ int srd_init(void) /* Load the decoder. */ ret = srd_load_decoder(decodername, &dec); - - /* Append it to the list of supported/loaded decoders. */ - list_pds = g_slist_append(list_pds, dec); + if (!ret) + { + /* Append it to the list of supported/loaded decoders. */ + list_pds = g_slist_append(list_pds, dec); + } } closedir(dir); @@ -203,7 +171,7 @@ static int h_str(PyObject *py_res, PyObject *py_mod, char *str; int ret; - py_str = PyMapping_GetItemString(py_res, (char *)key); + py_str = PyObject_GetAttrString(py_res, (char *)key); /* NEWREF */ if (!py_str || !PyString_Check(py_str)) { ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ goto err_h_decref_mod; @@ -250,8 +218,9 @@ static int srd_load_decoder(const char *name, struct srd_decoder **dec) { struct srd_decoder *d; - PyObject *py_mod, *py_func, *py_res /* , *py_tuple */; + PyObject *py_mod, *py_res; int r; + fprintf(stdout, "%s: %s\n", __func__, name); /* "Import" the Python module. */ if (!(py_mod = PyImport_ImportModule(name))) { /* NEWREF */ @@ -259,22 +228,21 @@ static int srd_load_decoder(const char *name, return SRD_ERR_PYTHON; /* TODO: More specific error? */ } - /* Get the 'register' dictionary as Python object. */ - py_res = PyObject_GetAttrString(py_mod, "register"); /* NEWREF */ - if (!py_res || PyCallable_Check(py_res)) { + /* Get the 'Decoder' class as Python object. */ + py_res = PyObject_GetAttrString(py_mod, "Decoder"); /* NEWREF */ + if (!py_res) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ Py_XDECREF(py_mod); - fprintf(stderr, "register dictionary was not found or is declared a function.\n"); + fprintf(stderr, "Decoder class not found in PD module %s\n", name); return SRD_ERR_PYTHON; /* TODO: More specific error? */ } - if (!(d = malloc(sizeof(struct srd_decoder)))) return SRD_ERR_MALLOC; - if ((r = h_str(py_res, py_mod, "id", &(d->id))) < 0) - return r; + /* We'll just use the name of the module for the id */ + d->id = strdup(name); if ((r = h_str(py_res, py_mod, "name", &(d->name))) < 0) return r; @@ -300,20 +268,7 @@ static int srd_load_decoder(const char *name, return r; d->py_mod = py_mod; - - Py_XDECREF(py_res); - - - /* Get the 'decode' function name as Python callable object. */ - py_func = PyObject_GetAttrString(py_mod, "decode"); /* NEWREF */ - if (!py_func || !PyCallable_Check(py_func)) { - if (PyErr_Occurred()) - PyErr_Print(); /* Returns void. */ - Py_XDECREF(py_mod); - return SRD_ERR_PYTHON; /* TODO: More specific error? */ - } - - d->py_decodefunc = py_func; + d->py_decobj = py_res; /* TODO: Handle func, inputformats, outputformats. */ /* Note: They must at least be set to NULL, will segfault otherwise. */ @@ -326,6 +281,42 @@ static int srd_load_decoder(const char *name, return SRD_OK; } +struct srd_decoder_instance *srd_instance_new(const char *id) +{ + struct srd_decoder *dec = srd_get_decoder_by_id(id); + struct srd_decoder_instance *di = g_malloc(sizeof(*di)); + PyObject *py_args, *py_value; + + /* Create a Python tuple of size 1. */ + if (!(py_args = PyTuple_New(0))) { /* NEWREF */ + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + + return NULL; /* TODO: More specific error? */ + } + + py_value = Py_BuildValue("{sssisd}", + "driver", "demo", + "unitsize", _unitsize, //FIXME: Pass in a unitsize that matches the selected LA + "starttime", 129318231823.0 //TODO: Fill with something reasonable. + ); + + /* Create an instance of the Decoder class */ + di->py_instance = PyObject_Call(dec->py_decobj, py_args, py_value); + if (!di->py_instance) { + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + Py_XDECREF(py_args); + Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */ + return NULL; /* TODO: More specific error? */ + } + + Py_XDECREF(py_args); + Py_XDECREF(py_value); + + return di; +} + /** * Run the specified decoder function. * @@ -337,13 +328,16 @@ static int srd_load_decoder(const char *name, * * @return SRD_OK upon success, a (negative) error code otherwise. */ -int srd_run_decoder(struct srd_decoder *dec, +int srd_run_decoder(struct srd_decoder_instance *dec, uint8_t *inbuf, uint64_t inbuflen, uint8_t **outbuf, uint64_t *outbuflen) { - PyObject *py_mod, *py_func, *py_args, *py_value, *py_res; - uint64_t inbuf_pos = 0; + PyObject *py_instance, *py_value, *py_res; int r, ret; + + /* FIXME: Don't have a timebase available here. Make one up. */ + static int _timehack = 0; + _timehack += inbuflen; /* TODO: Use #defines for the return codes. */ @@ -360,54 +354,30 @@ int srd_run_decoder(struct srd_decoder *dec, return SRD_ERR_ARGS; /* TODO: More specific error? */ /* TODO: Error handling. */ - py_mod = dec->py_mod; - Py_XINCREF(py_mod); - py_func = dec->py_decodefunc; - Py_XINCREF(py_func); + py_instance = dec->py_instance; + Py_XINCREF(py_instance); - /* Create a Python tuple of size 1. */ - if (!(py_args = PyTuple_New(1))) { /* NEWREF */ + /* Get the input buffer as Python "string" (byte array). */ + /* TODO: int vs. uint64_t for 'inbuflen'? */ + + py_value = Py_BuildValue("{sisiss#}", + "time", _timehack, + "duration", 10, + "data", inbuf, inbuflen / _unitsize + ); + + if (!(py_res = PyObject_CallMethod(py_instance, "decode", + "O", py_value))) { /* NEWREF */ ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ - goto err_run_decref_func; + goto err_run_decref_args; } - while (inbuf_pos < inbuflen) { - /* Get the input buffer as Python "string" (byte array). */ - /* TODO: int vs. uint64_t for 'inbuflen'? */ - - py_value = Py_BuildValue("{sisiss#}", - "time", inbuf_pos / _unitsize, - "duration", 10, - "data", &inbuf[inbuf_pos], _unitsize - ); - - /* - * IMPORTANT: PyTuple_SetItem() "steals" a reference to py_value! - * That means we are no longer responsible for Py_XDECREF()'ing it. - * It will automatically be free'd when the 'py_args' tuple is free'd. - */ - if (PyTuple_SetItem(py_args, 0, py_value) != 0) { /* STEAL */ - ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ - Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */ - goto err_run_decref_args; - } - - if (!(py_res = PyObject_CallObject(py_func, py_args))) { /* NEWREF */ - ret = SRD_ERR_PYTHON; /* TODO: More specific error? */ - goto err_run_decref_args; - } - inbuf_pos++; - } ret = SRD_OK; Py_XDECREF(py_res); - err_run_decref_args: - Py_XDECREF(py_args); -err_run_decref_func: - Py_XDECREF(py_func); - Py_XDECREF(py_mod); + Py_XDECREF(py_value); if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ @@ -432,7 +402,7 @@ static int srd_unload_decoder(struct srd_decoder *dec) if (dec->outputformats != NULL) g_slist_free(dec->outputformats); - Py_XDECREF(dec->py_decodefunc); + Py_XDECREF(dec->py_decobj); Py_XDECREF(dec->py_mod); return SRD_OK;