/* The list of protocol decoders. */
static GSList *list_pds = NULL;
+/* The list of protocol decoder instances: struct srd_decoder_instance */
+static GSList *decoders;
/*
* Here's a quick overview of Python/C API reference counting.
* Py_XDECREF()ing it (someone else will do it for you at some point).
*/
-static int srd_load_decoder(const char *name, struct srd_decoder **dec);
+static int srd_load_decoder(PyObject *py_res);
+
+static PyObject *emb_register(PyObject *self, PyObject *args)
+{
+ PyObject *arg;
+
+ (void)self;
+
+ if (!PyArg_ParseTuple(args, "O:decoder", &arg))
+ return NULL;
+
+ srd_load_decoder(arg);
+
+ Py_RETURN_NONE;
+}
static PyObject *emb_put(PyObject *self, PyObject *args)
{
if (!PyArg_ParseTuple(args, "O:put", &arg))
return NULL;
- // fprintf(stdout, "sigrok.put() called by decoder:\n");
PyObject_Print(arg, stdout, Py_PRINT_RAW);
puts("");
}
static PyMethodDef EmbMethods[] = {
+ {"register", emb_register, METH_VARARGS,
+ "Register a protocol decoder object with libsigrokdecode."},
{"put", emb_put, METH_VARARGS,
"Accepts a dictionary with the following keys: time, duration, data"},
{NULL, NULL, 0, NULL}
}
/* Load the decoder. */
- /* TODO: Warning if loading fails for a decoder. */
- ret = srd_load_decoder(decodername, &dec);
- if (!ret) {
- /* Append it to the list of supported/loaded decoders. */
- list_pds = g_slist_append(list_pds, dec);
+ /* "Import" the Python module. */
+ PyObject *py_mod;
+ if (!(py_mod = PyImport_ImportModule(decodername))) { /* NEWREF */
+ PyErr_Print(); /* Returns void. */
+ return SRD_ERR_PYTHON; /* TODO: More specific error? */
}
+ /* We release here. If any decoders were registered they
+ * will hold references. */
+ Py_XDECREF(py_mod);
}
closedir(dir);
* @return SRD_OK upon success, a (negative) error code otherwise.
* The 'outstr' argument points to a malloc()ed string upon success.
*/
-static int h_str(PyObject *py_res, PyObject *py_mod,
- const char *key, char **outstr)
+static int h_str(PyObject *py_res, const char *key, char **outstr)
{
PyObject *py_str;
char *str;
err_h_decref_str:
Py_XDECREF(py_str);
err_h_decref_mod:
- Py_XDECREF(py_mod);
if (PyErr_Occurred())
PyErr_Print(); /* Returns void. */
*
* @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(PyObject *py_res)
{
struct srd_decoder *d;
- 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 */
- PyErr_Print(); /* Returns void. */
- return SRD_ERR_PYTHON; /* TODO: More specific error? */
- }
-
- /* 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, "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;
- /* We'll just use the name of the module for the ID. */
- d->id = strdup(name);
+ if ((r = h_str(py_res, "id", &(d->id))) < 0)
+ return r;
- if ((r = h_str(py_res, py_mod, "name", &(d->name))) < 0)
+ if ((r = h_str(py_res, "name", &(d->name))) < 0)
return r;
- if ((r = h_str(py_res, py_mod, "longname",
+ if ((r = h_str(py_res, "longname",
&(d->longname))) < 0)
return r;
- if ((r = h_str(py_res, py_mod, "desc", &(d->desc))) < 0)
+ if ((r = h_str(py_res, "desc", &(d->desc))) < 0)
return r;
- if ((r = h_str(py_res, py_mod, "longdesc",
+ if ((r = h_str(py_res, "longdesc",
&(d->longdesc))) < 0)
return r;
- if ((r = h_str(py_res, py_mod, "author", &(d->author))) < 0)
+ if ((r = h_str(py_res, "author", &(d->author))) < 0)
return r;
- if ((r = h_str(py_res, py_mod, "email", &(d->email))) < 0)
+ if ((r = h_str(py_res, "email", &(d->email))) < 0)
return r;
- if ((r = h_str(py_res, py_mod, "license", &(d->license))) < 0)
+ if ((r = h_str(py_res, "license", &(d->license))) < 0)
return r;
- d->py_mod = py_mod;
d->py_decobj = py_res;
/* TODO: Handle func, inputformats, outputformats. */
d->inputformats = NULL;
d->outputformats = NULL;
- *dec = d;
+ Py_INCREF(py_res);
+ fprintf(stderr, "srd: registered '%s'\n", d->id);
+ list_pds = g_slist_append(list_pds, d);
return SRD_OK;
}
+/** Create a new decoder instance and add to session. */
struct srd_decoder_instance *srd_instance_new(const char *id)
{
struct srd_decoder *dec;
return NULL; /* TODO: More specific error? */
}
+ /* Append to list of PD instances */
+ decoders = g_slist_append(decoders, di);
+
Py_XDECREF(py_args);
return di;
return SRD_OK;
}
-int srd_instance_start(struct srd_decoder_instance *di,
- const char *driver, int unitsize, uint64_t starttime)
+/** Start decoding session. Feed metadata to decoder instances. */
+int srd_session_start(const char *driver, int unitsize, uint64_t starttime,
+ uint64_t samplerate)
{
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? */
+ GSList *d;
+ for (d = decoders; d; d = d->next) {
+ struct srd_decoder_instance *di = d->data;
+ /* TODO: Error handling. */
+ if (!(py_res = PyObject_CallMethod(di->py_instance, "start",
+ "{s:s,s:l,s:l,s:l}",
+ "driver", driver,
+ "unitsize", (long)unitsize,
+ "starttime", (long)starttime,
+ "samplerate", (long)samplerate))) {
+ if (PyErr_Occurred())
+ PyErr_Print(); /* Returns void. */
+
+ return SRD_ERR_PYTHON; /* TODO: More specific error? */
+ }
+ Py_XDECREF(py_res);
}
- Py_XDECREF(py_res);
+
return SRD_OK;
}
*
* @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)
+static int srd_run_decoder(struct srd_decoder_instance *dec,
+ uint8_t *inbuf, uint64_t inbuflen)
{
PyObject *py_instance, *py_res;
/* FIXME: Don't have a timebase available here. Make one up. */
return SRD_ERR_ARGS; /* TODO: More specific error? */
if (inbuflen == 0) /* No point in working on empty buffers. */
return SRD_ERR_ARGS; /* TODO: More specific error? */
- if (outbuf == NULL)
- 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;
return SRD_OK;
}
+/* Feed logic samples to decoder session. */
+int srd_session_feed(uint8_t *inbuf, uint64_t inbuflen)
+{
+ GSList *d;
+ for (d = decoders; d; d = d->next) {
+ /* TODO: Error handling. */
+
+ int ret = srd_run_decoder(d->data, inbuf, inbuflen);
+
+ if (ret != SRD_OK) {
+ /* This probably shouldn't fail catastrophically. */
+ fprintf(stderr, "Decoder runtime error (%d)\n", ret);
+ exit(1);
+ }
+ }
+ return SRD_OK;
+}
+
/**
* TODO
*/
g_slist_free(dec->outputformats);
Py_XDECREF(dec->py_decobj);
- Py_XDECREF(dec->py_mod);
/* TODO: (g_)free dec itself? */
projects / libsigrokdecode.git / blobdiff