X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=bf4a6b1baaf8a940312819145df1e3eedcc86d97;hp=016a75580fa1f99865732ddb7572d214464604f5;hb=0b9224604aa166775a6693efba215a33ce594b70;hpb=511e2123038c0df994ecadb1454d0869dc256698 diff --git a/type_decoder.c b/type_decoder.c index 016a755..bf4a6b1 100644 --- a/type_decoder.c +++ b/type_decoder.c @@ -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 * @@ -17,33 +17,35 @@ * along with this program. If not, see . */ -#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ -#include "sigrokdecode-internal.h" +#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include "libsigrokdecode-internal.h" #include "config.h" #include /* This is only used for nicer srd_dbg() output. */ -char *OUTPUT_TYPES[] = { +static const char *OUTPUT_TYPES[] = { "OUTPUT_ANN", - "OUTPUT_PROTO", + "OUTPUT_PYTHON", "OUTPUT_BINARY", }; -static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj, - int *ann_format, char ***ann) +static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj, + struct srd_proto_data *pdata) { PyObject *py_tmp; struct srd_pd_output *pdo; - int ann_id; + struct srd_proto_data_annotation *pda; + int ann_format; + char **ann_text; - /* Should be a list of [annotation format, [string, ...]] */ + /* 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... */ + /* 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, @@ -61,50 +63,54 @@ static int convert_pyobj(struct srd_decoder_instance *di, PyObject *obj, "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))) { + ann_format = PyLong_AsLong(py_tmp); + if (!(pdo = g_slist_nth_data(di->decoder->annotations, ann_format))) { srd_err("Protocol decoder %s submitted data to unregistered " - "annotation format %d.", di->decoder->name, ann_id); + "annotation format %d.", di->decoder->name, ann_format); return SRD_ERR_PYTHON; } - *ann_format = ann_id; - /* Second element must be a list */ + /* 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) { + if (py_strlist_to_char(py_tmp, &ann_text) != SRD_OK) { srd_err("Protocol decoder %s submitted annotation list, but " "second element was malformed.", di->decoder->name); return SRD_ERR_PYTHON; } + if (!(pda = g_try_malloc(sizeof(struct srd_proto_data_annotation)))) + return SRD_ERR_MALLOC; + pda->ann_format = ann_format; + pda->ann_text = ann_text; + pdata->data = pda; + return SRD_OK; } static PyObject *Decoder_put(PyObject *self, PyObject *args) { GSList *l; - PyObject *data, *py_res; - struct srd_decoder_instance *di, *next_di; + PyObject *py_data, *py_res; + struct srd_decoder_inst *di, *next_di; struct srd_pd_output *pdo; struct srd_proto_data *pdata; uint64_t start_sample, end_sample; int output_id; - void (*cb)(); + struct srd_pd_callback *cb; - if (!(di = srd_instance_find_by_obj(NULL, self))) { + if (!(di = srd_inst_find_by_obj(NULL, self))) { /* Shouldn't happen. */ srd_dbg("put(): self instance not found."); return NULL; } if (!PyArg_ParseTuple(args, "KKiO", &start_sample, &end_sample, - &output_id, &data)) { + &output_id, &py_data)) { /* * This throws an exception, but by returning NULL here we let * Python raise it. This results in a much better trace in @@ -121,7 +127,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) pdo = l->data; srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s on oid %d.", - di->instance_id, start_sample, end_sample, + di->inst_id, start_sample, end_sample, OUTPUT_TYPES[pdo->output_type], output_id); if (!(pdata = g_try_malloc0(sizeof(struct srd_proto_data)))) { @@ -135,29 +141,28 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) switch (pdo->output_type) { case SRD_OUTPUT_ANN: /* Annotations are only fed to callbacks. */ - if ((cb = srd_find_callback(pdo->output_type))) { + if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) { /* Annotations need converting from PyObject. */ - if (convert_pyobj(di, data, &pdata->ann_format, - (char ***)&pdata->data) != SRD_OK) { + if (convert_annotation(di, py_data, pdata) != SRD_OK) { /* An error was already logged. */ break; } - cb(pdata); + cb->cb(pdata, cb->cb_data); } break; - case SRD_OUTPUT_PROTO: + case SRD_OUTPUT_PYTHON: for (l = di->next_di; l; l = l->next) { next_di = l->data; - /* TODO: is this needed? */ - Py_XINCREF(next_di->py_instance); + /* TODO: Is this needed? */ + Py_XINCREF(next_di->py_inst); srd_spew("Sending %d-%d to instance %s", start_sample, end_sample, - next_di->instance_id); + next_di->inst_id); if (!(py_res = PyObject_CallMethod( - next_di->py_instance, "decode", "KKO", start_sample, - end_sample, data))) { - catch_exception("calling %s decode(): ", - next_di->instance_id); + next_di->py_inst, "decode", "KKO", start_sample, + end_sample, py_data))) { + srd_exception_catch("Calling %s decode(): ", + next_di->inst_id); } Py_XDECREF(py_res); } @@ -179,11 +184,11 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) static PyObject *Decoder_add(PyObject *self, PyObject *args) { PyObject *ret; - struct srd_decoder_instance *di; + struct srd_decoder_inst *di; char *proto_id; int output_type, pdo_id; - if (!(di = srd_instance_find_by_obj(NULL, self))) { + if (!(di = srd_inst_find_by_obj(NULL, self))) { PyErr_SetString(PyExc_Exception, "decoder instance not found"); return NULL; } @@ -193,7 +198,7 @@ static PyObject *Decoder_add(PyObject *self, PyObject *args) return NULL; } - pdo_id = pd_add(di, output_type, proto_id); + pdo_id = srd_inst_pd_output_add(di, output_type, proto_id); if (pdo_id < 0) Py_RETURN_NONE; else @@ -209,11 +214,13 @@ static PyMethodDef Decoder_methods[] = { {NULL, NULL, 0, NULL} }; +/** @cond PRIVATE */ SRD_PRIV 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_doc = "sigrok Decoder base class", .tp_methods = Decoder_methods, }; +/** @endcond */