* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <stdio.h>
#include <string.h>
#include <dirent.h>
-#include <config.h>
/* Re-define some string functions for Python >= 3.0. */
#if PY_VERSION_HEX >= 0x03000000
#endif
/* The list of protocol decoders. */
-GSList *list_pds = NULL;
+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 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");
+ PyObject_Print(arg, stdout, Py_PRINT_RAW);
+ puts("");
+
+ Py_RETURN_NONE;
+}
+
+static PyMethodDef EmbMethods[] = {
+ {"put", emb_put, METH_VARARGS,
+ "Accepts a dictionary with the following keys: time, duration, data"},
+ {NULL, NULL, 0, NULL}
+};
+
/**
* Initialize libsigrokdecode.
*
- * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise.
+ * This initializes the Python interpreter, and creates and initializes
+ * a "sigrok" Python module with a single put() method.
+ *
+ * Then, it searches for sigrok protocol decoder files (*.py) in the
+ * "decoders" subdirectory of the the sigrok installation directory.
+ * All decoders that are found are loaded into memory and added to an
+ * internal list of decoders, which can be queried via srd_list_decoders().
+ *
+ * The caller is responsible for calling the clean-up function srd_exit(),
+ * which will properly shut down libsigrokdecode and free its allocated memory.
+ *
+ * Multiple calls to srd_init(), without calling srd_exit() inbetween,
+ * are not allowed.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
+ * Upon Python errors, return SRD_ERR_PYTHON. If the sigrok decoders
+ * directory cannot be accessed, return SRD_ERR_DECODERS_DIR.
+ * If not enough memory could be allocated, return SRD_ERR_MALLOC.
*/
-int sigrokdecode_init(void)
+int srd_init(void)
{
DIR *dir;
struct dirent *dp;
- char *tmp;
+ char *decodername;
+ struct srd_decoder *dec;
+ int ret;
/* Py_Initialize() returns void and usually cannot fail. */
Py_Initialize();
+ /* 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)))
- return SIGROKDECODE_ERR_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;
- /* For now use the filename (without .py) as decoder name. */
- if ((tmp = g_strndup(dp->d_name, strlen(dp->d_name) - 3)))
- list_pds = g_slist_append(list_pds, tmp);
+
+ /* Decoder name == filename (without .py suffix). */
+ decodername = g_strndup(dp->d_name, strlen(dp->d_name) - 3);
+
+ /* 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) {
+ /* Append it to the list of supported/loaded decoders. */
+ list_pds = g_slist_append(list_pds, dec);
+ }
}
closedir(dir);
- return SIGROKDECODE_OK;
+ return SRD_OK;
}
/**
*
* @return List of decoders, NULL if none are supported or loaded.
*/
-GSList *sigrokdecode_list_decoders(void)
+GSList *srd_list_decoders(void)
{
return list_pds;
}
+/**
+ * Get the decoder with the specified ID.
+ *
+ * @param id The ID string of the decoder to return.
+ * @return The decoder with the specified ID, or NULL if not found.
+ */
+struct srd_decoder *srd_get_decoder_by_id(const char *id)
+{
+ GSList *l;
+ struct srd_decoder *dec;
+
+ for (l = srd_list_decoders(); l; l = l->next) {
+ dec = l->data;
+ if (!strcmp(dec->id, id))
+ return dec;
+ }
+
+ return NULL;
+}
+
/**
* Helper function to handle Python strings.
*
* TODO: @param entries.
*
- * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise.
+ * @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_func, PyObject *py_mod,
+static int h_str(PyObject *py_res, PyObject *py_mod,
const char *key, char **outstr)
{
PyObject *py_str;
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 = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
- goto err_h_decref_func;
+ ret = SRD_ERR_PYTHON; /* TODO: More specific error? */
+ goto err_h_decref_mod;
}
/*
* must not be free()'d.
*/
if (!(str = PyString_AsString(py_str))) {
- ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
+ ret = SRD_ERR_PYTHON; /* TODO: More specific error? */
goto err_h_decref_str;
}
- if (!(*outstr = strdup(str))) {
- ret = SIGROKDECODE_ERR_MALLOC;
+ if (!(*outstr = g_strdup(str))) {
+ ret = SRD_ERR_MALLOC;
goto err_h_decref_str;
}
Py_XDECREF(py_str);
- return SIGROKDECODE_OK;
+ return SRD_OK;
err_h_decref_str:
Py_XDECREF(py_str);
-err_h_decref_func:
- Py_XDECREF(py_func);
err_h_decref_mod:
Py_XDECREF(py_mod);
*
* @param name TODO
*
- * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise.
+ * @return SRD_OK upon success, a (negative) error code otherwise.
*/
-int sigrokdecode_load_decoder(const char *name,
- struct sigrokdecode_decoder **dec)
+static int srd_load_decoder(const char *name, struct srd_decoder **dec)
{
- struct sigrokdecode_decoder *d;
- PyObject *py_mod, *py_func, *py_res /* , *py_tuple */;
+ 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 SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
+ return SRD_ERR_PYTHON; /* TODO: More specific error? */
}
- /* Get the 'register' function name as Python callable object. */
- py_func = PyObject_GetAttrString(py_mod, "register"); /* NEWREF */
- if (!py_func || !PyCallable_Check(py_func)) {
+ /* 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);
- return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
+ fprintf(stderr, "Decoder class not found in PD module %s\n", name);
+ return SRD_ERR_PYTHON; /* TODO: More specific error? */
}
- /* Call the 'register' function without arguments, get the result. */
- if (!(py_res = PyObject_CallFunction(py_func, NULL))) { /* NEWREF */
- PyErr_Print(); /* Returns void. */
- Py_XDECREF(py_func);
- Py_XDECREF(py_mod);
- return SIGROKDECODE_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, py_mod, "name", &(d->name))) < 0)
+ return r;
- if (!(d = malloc(sizeof(struct sigrokdecode_decoder))))
- return SIGROKDECODE_ERR_MALLOC;
+ if ((r = h_str(py_res, py_mod, "longname",
+ &(d->longname))) < 0)
+ return r;
+
+ if ((r = h_str(py_res, py_mod, "desc", &(d->desc))) < 0)
+ return r;
- if ((r = h_str(py_res, py_func, py_mod, "id", &(d->id))) < 0)
+ if ((r = h_str(py_res, py_mod, "longdesc",
+ &(d->longdesc))) < 0)
return r;
- if ((r = h_str(py_res, py_func, py_mod, "name", &(d->name))) < 0)
+ if ((r = h_str(py_res, py_mod, "author", &(d->author))) < 0)
return r;
- if ((r = h_str(py_res, py_func, py_mod, "desc", &(d->desc))) < 0)
+ if ((r = h_str(py_res, py_mod, "email", &(d->email))) < 0)
+ return r;
+
+ if ((r = h_str(py_res, py_mod, "license", &(d->license))) < 0)
return r;
d->py_mod = py_mod;
+ d->py_decobj = py_res;
- Py_XDECREF(py_res);
- Py_XDECREF(py_func);
+ /* TODO: Handle func, inputformats, outputformats. */
+ /* Note: They must at least be set to NULL, will segfault otherwise. */
+ d->func = NULL;
+ d->inputformats = NULL;
+ d->outputformats = NULL;
- /* Get the 'decode' function name as Python callable object. */
- py_func = PyObject_GetAttrString(py_mod, "decode"); /* NEWREF */
- if (!py_func || !PyCallable_Check(py_func)) {
+ *dec = 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;
+ struct srd_decoder_instance *di;
+ PyObject *py_args;
+
+ if (!(dec = srd_get_decoder_by_id(id)))
+ return NULL;
+
+ /* 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. */
- Py_XDECREF(py_mod);
- return SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
+
+ return NULL; /* TODO: More specific error? */
}
- d->py_func = py_func;
+ /* 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);
+ return NULL; /* TODO: More specific error? */
+ }
- /* TODO: Handle inputformats, outputformats. */
+ /* Append to list of PD instances */
+ decoders = g_slist_append(decoders, di);
- *dec = d;
+ Py_XDECREF(py_args);
+
+ return di;
+}
+
+int srd_instance_set_probe(struct srd_decoder_instance *di,
+ 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);
+
+ Py_XDECREF(probenum);
+ Py_XDECREF(probedict);
+
+ return SRD_OK;
+}
- return SIGROKDECODE_OK;
+/** 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;
+ 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);
+ }
+
+ return SRD_OK;
}
/**
* @param outbuf TODO
* @param outbuflen TODO
*
- * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise.
+ * @return SRD_OK upon success, a (negative) error code otherwise.
*/
-int sigrokdecode_run_decoder(struct sigrokdecode_decoder *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_mod, *py_func, *py_args, *py_value, *py_res;
- int r, 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. */
/* Return an error upon unusable input. */
if (dec == NULL)
- return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */
+ return SRD_ERR_ARGS; /* TODO: More specific error? */
if (inbuf == NULL)
- return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */
+ return SRD_ERR_ARGS; /* TODO: More specific error? */
if (inbuflen == 0) /* No point in working on empty buffers. */
- return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */
- if (outbuf == NULL)
- return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */
- if (outbuflen == NULL)
- return SIGROKDECODE_ERR_ARGS; /* TODO: More specific error? */
+ return SRD_ERR_ARGS; /* TODO: More specific error? */
/* TODO: Error handling. */
- py_mod = dec->py_mod;
- Py_XINCREF(py_mod);
- py_func = dec->py_func;
- Py_XINCREF(py_func);
-
- /* Create a Python tuple of size 1. */
- if (!(py_args = PyTuple_New(1))) { /* NEWREF */
- ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
- goto err_run_decref_func;
- }
+ py_instance = dec->py_instance;
+ Py_XINCREF(py_instance);
+
+ 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. */
- /* Get the input buffer as Python "string" (byte array). */
- /* TODO: int vs. uint64_t for 'inbuflen'? */
- if (!(py_value = Py_BuildValue("s#", inbuf, inbuflen))) { /* NEWREF */
- ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
- goto err_run_decref_args;
- }
+ return SRD_ERR_PYTHON; /* TODO: More specific error? */
+ }
- /*
- * 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 = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
- Py_XDECREF(py_value); /* TODO: Ref. stolen upon error? */
- goto err_run_decref_args;
- }
+ Py_XDECREF(py_res);
+ return SRD_OK;
+}
- if (!(py_res = PyObject_CallObject(py_func, py_args))) { /* NEWREF */
- ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
- goto err_run_decref_args;
+/* 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) {
+ fprintf(stderr, "Decoder runtime error (%d)\n", ret);
+ exit(1);
+ }
}
+}
- if ((r = PyObject_AsCharBuffer(py_res, (const char **)outbuf,
- (Py_ssize_t *)outbuflen))) {
- ret = SIGROKDECODE_ERR_PYTHON; /* TODO: More specific error? */
- Py_XDECREF(py_res);
- goto err_run_decref_args;
- }
+/**
+ * TODO
+ */
+static int srd_unload_decoder(struct srd_decoder *dec)
+{
+ g_free(dec->id);
+ g_free(dec->name);
+ g_free(dec->desc);
+ g_free(dec->func);
- ret = SIGROKDECODE_OK;
+ /* TODO: Free everything in inputformats and outputformats. */
- Py_XDECREF(py_res);
+ if (dec->inputformats != NULL)
+ g_slist_free(dec->inputformats);
+ if (dec->outputformats != NULL)
+ g_slist_free(dec->outputformats);
-err_run_decref_args:
- Py_XDECREF(py_args);
-err_run_decref_func:
- Py_XDECREF(py_func);
-err_run_decref_mod:
- Py_XDECREF(py_mod);
+ Py_XDECREF(dec->py_decobj);
+ Py_XDECREF(dec->py_mod);
- if (PyErr_Occurred())
- PyErr_Print(); /* Returns void. */
+ /* TODO: (g_)free dec itself? */
- return ret;
+ return SRD_OK;
+}
+
+/**
+ * TODO
+ */
+static int srd_unload_all_decoders(void)
+{
+ GSList *l;
+ struct srd_decoder *dec;
+
+ for (l = srd_list_decoders(); l; l = l->next) {
+ dec = l->data;
+ /* TODO: Error handling. */
+ srd_unload_decoder(dec);
+ }
+
+ return SRD_OK;
}
/**
* Shutdown libsigrokdecode.
*
- * @return SIGROKDECODE_OK upon success, a (negative) error code otherwise.
+ * This frees all the memory allocated for protocol decoders and shuts down
+ * the Python interpreter.
+ *
+ * This function should only be called if there was a (successful!) invocation
+ * of srd_init() before. Calling this function multiple times in a row, without
+ * any successful srd_init() calls inbetween, is not allowed.
+ *
+ * @return SRD_OK upon success, a (negative) error code otherwise.
*/
-int sigrokdecode_shutdown(void)
+int srd_exit(void)
{
+ /* Unload/free all decoders, and then the list of decoders itself. */
+ /* TODO: Error handling. */
+ srd_unload_all_decoders();
+ g_slist_free(list_pds);
+
/* Py_Finalize() returns void, any finalization errors are ignored. */
Py_Finalize();
- return SIGROKDECODE_OK;
+ return SRD_OK;
}
projects / libsigrokdecode.git / blobdiff