X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decode.c;h=50b87b4c269478d834770531f7092417ca2ae2a7;hp=6c63fa7c1f069ca44faa1ed4b80966cb752a0aba;hb=c4262fd6b2f8ef540b8cc93ac61956d89062d2be;hpb=c75080f0d84de5f2aa73472ad4d6cf32aaeba88e diff --git a/decode.c b/decode.c index 6c63fa7..50b87b4 100644 --- a/decode.c +++ b/decode.c @@ -49,19 +49,16 @@ static GSList *list_pds = NULL; static int srd_load_decoder(const char *name, struct srd_decoder **dec); -static int _unitsize = 1; - -static PyObject* -emb_put(PyObject *self, PyObject *args) +static PyObject *emb_put(PyObject *self, PyObject *args) { PyObject *arg; - + (void)self; if (!PyArg_ParseTuple(args, "O:put", &arg)) return NULL; - fprintf(stdout, "sigrok.put() called by decoder:\n"); + // fprintf(stdout, "sigrok.put() called by decoder:\n"); PyObject_Print(arg, stdout, Py_PRINT_RAW); puts(""); @@ -70,7 +67,7 @@ emb_put(PyObject *self, PyObject *args) static PyMethodDef EmbMethods[] = { {"put", emb_put, METH_VARARGS, - "Accepts a dictionary with the following keys: time, duration, data"}, + "Accepts a dictionary with the following keys: time, duration, data"}, {NULL, NULL, 0, NULL} }; @@ -107,31 +104,44 @@ int srd_init(void) /* Py_Initialize() returns void and usually cannot fail. */ Py_Initialize(); - Py_InitModule("sigrok", EmbMethods); + /* TODO: Use Py_InitModule3() to add a docstring? */ + if (!Py_InitModule("sigrok", EmbMethods)) { + Py_Finalize(); /* Returns void. */ + return SRD_ERR_PYTHON; + } /* Add search directory for the protocol decoders. */ - /* FIXME: Check error code. */ /* FIXME: What happens if this function is called multiple times? */ - PyRun_SimpleString("import sys;" - "sys.path.append(r'" DECODERS_DIR "');"); + ret = PyRun_SimpleString("import sys;" + "sys.path.append(r'" DECODERS_DIR "');"); + if (ret != 0) { + Py_Finalize(); /* Returns void. */ + return SRD_ERR_PYTHON; + } - if (!(dir = opendir(DECODERS_DIR))) + if (!(dir = opendir(DECODERS_DIR))) { + Py_Finalize(); /* Returns void. */ return SRD_ERR_DECODERS_DIR; + } while ((dp = readdir(dir)) != NULL) { + /* Ignore filenames which don't end with ".py". */ if (!g_str_has_suffix(dp->d_name, ".py")) continue; /* Decoder name == filename (without .py suffix). */ decodername = g_strndup(dp->d_name, strlen(dp->d_name) - 3); - /* TODO: Error handling. */ - dec = malloc(sizeof(struct srd_decoder)); + /* 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. */ ret = srd_load_decoder(decodername, &dec); - if (!ret) - { + if (!ret) { /* Append it to the list of supported/loaded decoders. */ list_pds = g_slist_append(list_pds, dec); } @@ -231,12 +241,12 @@ err_h_decref_mod: * * @return SRD_OK upon success, a (negative) error code otherwise. */ -static int srd_load_decoder(const char *name, - struct srd_decoder **dec) +static int srd_load_decoder(const char *name, struct srd_decoder **dec) { struct srd_decoder *d; PyObject *py_mod, *py_res; int r; + fprintf(stdout, "%s: %s\n", __func__, name); /* "Import" the Python module. */ @@ -258,7 +268,7 @@ static int srd_load_decoder(const char *name, if (!(d = malloc(sizeof(struct srd_decoder)))) return SRD_ERR_MALLOC; - /* We'll just use the name of the module for the id */ + /* 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) @@ -300,59 +310,76 @@ static int srd_load_decoder(const char *name, struct srd_decoder_instance *srd_instance_new(const char *id) { - struct srd_decoder *dec = srd_get_decoder_by_id(id); - if (!dec) + struct srd_decoder *dec; + struct srd_decoder_instance *di; + PyObject *py_args; + + if (!(dec = srd_get_decoder_by_id(id))) return NULL; - struct srd_decoder_instance *di = g_malloc(sizeof(*di)); - PyObject *py_args, *py_value; - /* Create a Python tuple of size 1. */ + /* TODO: Error handling. Use g_try_malloc(). */ + di = g_malloc(sizeof(*di)); + + /* Create an empty Python tuple. */ 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); + + /* Create an instance of the 'Decoder' class. */ + di->py_instance = PyObject_Call(dec->py_decobj, py_args, NULL); 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; } int srd_instance_set_probe(struct srd_decoder_instance *di, - const char *probename, int num) + const char *probename, int num) { PyObject *probedict, *probenum; + probedict = PyObject_GetAttrString(di->py_instance, "probes"); /* NEWREF */ if (!probedict) { if (PyErr_Occurred()) PyErr_Print(); /* Returns void. */ - + return SRD_ERR_PYTHON; /* TODO: More specific error? */ } probenum = PyInt_FromLong(num); - PyMapping_SetItemString(probedict, (char*)probename, probenum); + PyMapping_SetItemString(probedict, (char *)probename, probenum); Py_XDECREF(probenum); Py_XDECREF(probedict); + + return SRD_OK; +} + +int srd_instance_start(struct srd_decoder_instance *di, + const char *driver, int unitsize, uint64_t starttime) +{ + PyObject *py_res; + + if (!(py_res = PyObject_CallMethod(di->py_instance, "start", + "{s:s,s:i,s:d}", + "driver", driver, + "unitsize", unitsize, + "starttime", starttime))) { + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ + + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } + Py_XDECREF(py_res); return SRD_OK; } @@ -368,14 +395,13 @@ int srd_instance_set_probe(struct srd_decoder_instance *di, * @return SRD_OK upon success, a (negative) error code otherwise. */ int srd_run_decoder(struct srd_decoder_instance *dec, - uint8_t *inbuf, uint64_t inbuflen, - uint8_t **outbuf, uint64_t *outbuflen) + uint8_t *inbuf, uint64_t inbuflen, + uint8_t **outbuf, uint64_t *outbuflen) { - PyObject *py_instance, *py_value, *py_res; - int ret; - + PyObject *py_instance, *py_res; /* FIXME: Don't have a timebase available here. Make one up. */ static int _timehack = 0; + _timehack += inbuflen; /* TODO: Use #defines for the return codes. */ @@ -391,37 +417,24 @@ int srd_run_decoder(struct srd_decoder_instance *dec, return SRD_ERR_ARGS; /* TODO: More specific error? */ if (outbuflen == NULL) return SRD_ERR_ARGS; /* TODO: More specific error? */ - + /* TODO: Error handling. */ py_instance = dec->py_instance; Py_XINCREF(py_instance); - /* 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_args; - } - + if (!(py_res = PyObject_CallMethod(py_instance, "decode", + "{s:i,s:i,s:s#}", + "time", _timehack, + "duration", 10, + "data", inbuf, inbuflen))) { /* NEWREF */ + if (PyErr_Occurred()) + PyErr_Print(); /* Returns void. */ - ret = SRD_OK; + return SRD_ERR_PYTHON; /* TODO: More specific error? */ + } Py_XDECREF(py_res); -err_run_decref_args: - Py_XDECREF(py_value); - - if (PyErr_Occurred()) - PyErr_Print(); /* Returns void. */ - - return ret; + return SRD_OK; } /** @@ -444,6 +457,8 @@ static int srd_unload_decoder(struct srd_decoder *dec) Py_XDECREF(dec->py_decobj); Py_XDECREF(dec->py_mod); + /* TODO: (g_)free dec itself? */ + return SRD_OK; }