X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=controller.c;h=2355deea96a8ca651d9f55a34dfefae082a36aad;hp=d2056915b831c961c90cc1373ecf395c89e7f478;hb=fa12a21e3c779df4e33dcfe394e2ded3f96028ce;hpb=4fadb1282f5e9aa41abcb67e7d90cdc4a9b2628d diff --git a/controller.c b/controller.c index d205691..2355dee 100644 --- a/controller.c +++ b/controller.c @@ -68,7 +68,7 @@ int srd_init(void) { int ret; - srd_dbg("srd: initializing"); + srd_dbg("Initializing libsigrokdecode."); /* Add our own module to the list of built-in modules. */ PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode); @@ -105,7 +105,7 @@ int srd_init(void) int srd_exit(void) { - srd_dbg("srd: exiting"); + srd_dbg("Exiting libsigrokdecode."); srd_unload_all_decoders(); g_slist_free(pd_list); @@ -118,10 +118,19 @@ int srd_exit(void) /** - * Add search directories for the protocol decoders. + * Add an additional search directory for the protocol decoders. + * + * The specified directory is prepended (not appended!) to Python's sys.path, + * in order to search for sigrok protocol decoders in the specified + * directories first, and in the generic Python module directories (and in + * the current working directory) last. This avoids conflicts if there are + * Python modules which have the same name as a sigrok protocol decoder in + * sys.path or in the current working directory. * * TODO: add path from env var SIGROKDECODE_PATH, config etc * TODO: Should take directoryname/path as input. + * + * @return TODO. */ int set_modulepath(void) { @@ -143,9 +152,8 @@ int set_modulepath(void) path = g_strdup(DECODERS_DIR); #endif - /* TODO: Prepend instead of appending. */ /* TODO: Sanity check on 'path' (length, escape special chars, ...). */ - s = g_strdup_printf("import sys; sys.path.append(r'%s')", path); + s = g_strdup_printf("import sys; sys.path.insert(0, r'%s')", path); ret = PyRun_SimpleString(s); @@ -264,13 +272,9 @@ err_out: Py_XDECREF(py_di_options); Py_XDECREF(py_dec_optkeys); Py_XDECREF(py_dec_options); - if (key) - g_free(key); - if (PyErr_Occurred()) { - srd_dbg("srd: stray exception!"); - PyErr_Print(); - PyErr_Clear(); - } + g_free(key); + if (PyErr_Occurred()) + catch_exception("Stray exception in srd_instance_set_options()."); return ret; } @@ -299,7 +303,10 @@ int srd_instance_set_probes(struct srd_decoder_instance *di, GSList *sl; struct srd_probe *p; int *new_probemap, new_probenum; - char *probe_id; + char *probe_id, *probenum_str; + + srd_dbg("set probes called for instance %s with list of %d probes", + di->instance_id, g_hash_table_size(new_probes)); if (g_hash_table_size(new_probes) == 0) /* No probes provided. */ @@ -321,7 +328,14 @@ int srd_instance_set_probes(struct srd_decoder_instance *di, for (l = g_hash_table_get_keys(new_probes); l; l = l->next) { probe_id = l->data; - new_probenum = strtol(g_hash_table_lookup(new_probes, probe_id), NULL, 10); + probenum_str = g_hash_table_lookup(new_probes, probe_id); + if (!probenum_str) { + /* Probe name was specified without a value. */ + srd_err("No probe number was specified for %s.", probe_id); + g_free(new_probemap); + return SRD_ERR_ARG; + } + new_probenum = strtol(probenum_str, NULL, 10); if (!(sl = g_slist_find_custom(di->decoder->probes, probe_id, (GCompareFunc)compare_probe_id))) { /* Fall back on optional probes. */ @@ -335,6 +349,7 @@ int srd_instance_set_probes(struct srd_decoder_instance *di, } p = sl->data; new_probemap[p->order] = new_probenum; + srd_dbg("setting probe mapping for %d = probe %d", p->order, new_probenum); } g_free(di->dec_probemap); di->dec_probemap = new_probemap; @@ -359,7 +374,7 @@ struct srd_decoder_instance *srd_instance_new(const char *decoder_id, int i; char *instance_id; - srd_dbg("srd: creating new %s instance", decoder_id); + srd_dbg("Creating new %s instance.", decoder_id); if (!(dec = srd_get_decoder_by_id(decoder_id))) { srd_err("Protocol decoder %s not found.", decoder_id); @@ -394,7 +409,7 @@ struct srd_decoder_instance *srd_instance_new(const char *decoder_id, /* Create a new instance of this decoder class. */ if (!(di->py_instance = PyObject_CallObject(dec->py_dec, NULL))) { if (PyErr_Occurred()) - PyErr_Print(); + catch_exception("failed to create %s instance: ", decoder_id); g_free(di->dec_probemap); g_free(di); return NULL; @@ -421,23 +436,27 @@ int srd_instance_stack(struct srd_decoder_instance *di_from, return SRD_ERR_ARG; } - if (!g_slist_find(di_list, di_from)) { - srd_err("Unstacked instance not found."); - return SRD_ERR_ARG; + if (g_slist_find(di_list, di_to)) { + /* Remove from the unstacked list. */ + di_list = g_slist_remove(di_list, di_to); } - /* Remove from the unstacked list. */ - di_list = g_slist_remove(di_list, di_to); - /* Stack on top of source di. */ di_from->next_di = g_slist_append(di_from->next_di, di_to); return SRD_OK; } - -/* TODO: this should go into the PD stack */ -struct srd_decoder_instance *srd_instance_find(char *instance_id) +/** + * Finds a decoder instance by its instance id, but only in the bottom + * level of instances -- instances already stacked on top of another one + * will not be found. + * + * @param instance_id The instance id to be found. + * + * @return Pointer to struct srd_decoder_instance, or NULL if not found. + */ +struct srd_decoder_instance *srd_instance_find_by_id(char *instance_id) { GSList *l; struct srd_decoder_instance *tmp, *di; @@ -454,30 +473,69 @@ struct srd_decoder_instance *srd_instance_find(char *instance_id) return di; } +/** + * Finds a decoder instance by its python object, i.e. that instance's + * instantiation of the sigrokdecode.Decoder class. This will recurse + * to find the instance anywhere in the stack tree. + * + * @param stack Pointer to a GSList of struct srd_decoder_instance, + * indicating the stack to search. To start searching at the bottom + * level of decoder instances, pass NULL. + * @param obj The python class instantiation. + * + * @return Pointer to struct srd_decoder_instance, or NULL if not found. + */ +struct srd_decoder_instance *srd_instance_find_by_obj(GSList *stack, + PyObject *obj) +{ + GSList *l; + struct srd_decoder_instance *tmp, *di; + + di = NULL; + for (l = stack ? stack : di_list; di == NULL && l != NULL; l = l->next) { + tmp = l->data; + if (tmp->py_instance == obj) + di = tmp; + else if (tmp->next_di) + di = srd_instance_find_by_obj(tmp->next_di, obj); + } + + return di; +} + int srd_instance_start(struct srd_decoder_instance *di, PyObject *args) { PyObject *py_name, *py_res; + GSList *l; + struct srd_decoder_instance *next_di; - srd_dbg("srd: calling start() method on protocol decoder instance %s", - di->instance_id); + srd_dbg("Calling start() method on protocol decoder instance %s.", + di->instance_id); if (!(py_name = PyUnicode_FromString("start"))) { srd_err("Unable to build python object for 'start'."); - if (PyErr_Occurred()) - PyErr_Print(); + catch_exception("Protocol decoder instance %s: ", di->instance_id); return SRD_ERR_PYTHON; } if (!(py_res = PyObject_CallMethodObjArgs(di->py_instance, py_name, args, NULL))) { - if (PyErr_Occurred()) - PyErr_Print(); + catch_exception("Protocol decoder instance %s: ", di->instance_id); return SRD_ERR_PYTHON; } Py_DecRef(py_res); Py_DecRef(py_name); + /* Start all the PDs stacked on top of this one. Pass along the + * metadata all the way from the bottom PD, even though it's only + * applicable to logic data for now. + */ + for (l = di->next_di; l; l = l->next) { + next_di = l->data; + srd_instance_start(next_di, args); + } + return SRD_OK; } @@ -485,34 +543,34 @@ int srd_instance_start(struct srd_decoder_instance *di, PyObject *args) * Run the specified decoder function. * * @param start_samplenum The starting sample number for the buffer's sample - * set, relative to the start of capture. - * @param di The decoder instance to call. - * @param inbuf The buffer to decode. - * @param inbuflen Length of the buffer. + * set, relative to the start of capture. + * @param di The decoder instance to call. Must not be NULL. + * @param inbuf The buffer to decode. Must not be NULL. + * @param inbuflen Length of the buffer. Must be > 0. * * @return SRD_OK upon success, a (negative) error code otherwise. */ int srd_instance_decode(uint64_t start_samplenum, - struct srd_decoder_instance *di, uint8_t *inbuf, uint64_t inbuflen) + struct srd_decoder_instance *di, uint8_t *inbuf, uint64_t inbuflen) { PyObject *py_res; srd_logic *logic; uint64_t end_samplenum; - srd_dbg("srd: calling decode() on instance %s with %d bytes starting " - "at sample %d", di->instance_id, inbuflen, start_samplenum); + srd_dbg("Calling decode() on instance %s with %d bytes starting " + "at sample %d.", di->instance_id, inbuflen, start_samplenum); /* Return an error upon unusable input. */ - if (di == NULL) { - srd_dbg("srd: empty decoder instance"); + if (!di) { + srd_dbg("empty decoder instance"); return SRD_ERR_ARG; } - if (inbuf == NULL) { - srd_dbg("srd: NULL buffer pointer"); + if (!inbuf) { + srd_dbg("NULL buffer pointer"); return SRD_ERR_ARG; } if (inbuflen == 0) { - srd_dbg("srd: empty buffer"); + srd_dbg("empty buffer"); return SRD_ERR_ARG; } @@ -533,9 +591,7 @@ int srd_instance_decode(uint64_t start_samplenum, end_samplenum = start_samplenum + inbuflen / di->data_unitsize; if (!(py_res = PyObject_CallMethod(di->py_instance, "decode", "KKO", logic->start_samplenum, end_samplenum, logic))) { - if (PyErr_Occurred()) - PyErr_Print(); /* Returns void. */ - + catch_exception("Protocol decoder instance %s: ", di->instance_id); return SRD_ERR_PYTHON; /* TODO: More specific error? */ } Py_DecRef(py_res); @@ -543,16 +599,54 @@ int srd_instance_decode(uint64_t start_samplenum, return SRD_OK; } +void srd_instance_free(struct srd_decoder_instance *di) +{ + GSList *l; + struct srd_pd_output *pdo; + + srd_dbg("Freeing instance %s", di->instance_id); + + Py_DecRef(di->py_instance); + g_free(di->instance_id); + g_free(di->dec_probemap); + g_slist_free(di->next_di); + for (l = di->pd_output; l; l = l->next) { + pdo = l->data; + g_free(pdo->proto_id); + g_free(pdo); + } + g_slist_free(di->pd_output); + +} + +void srd_instance_free_all(GSList *stack) +{ + GSList *l; + struct srd_decoder_instance *di; + + di = NULL; + for (l = stack ? stack : di_list; di == NULL && l != NULL; l = l->next) { + di = l->data; + if (di->next_di) + srd_instance_free_all(di->next_di); + srd_instance_free(di); + } + if (!stack) { + g_slist_free(di_list); + di_list = NULL; + } + +} int srd_session_start(int num_probes, int unitsize, uint64_t samplerate) { PyObject *args; - GSList *d, *s; + GSList *d; struct srd_decoder_instance *di; int ret; - srd_dbg("srd: calling start() on all instances with %d probes, " - "unitsize %d samplerate %d", num_probes, unitsize, samplerate); + srd_dbg("Calling start() on all instances with %d probes, " + "unitsize %d samplerate %d.", num_probes, unitsize, samplerate); /* Currently only one item of metadata is passed along to decoders, * samplerate. This can be extended as needed. @@ -569,20 +663,12 @@ int srd_session_start(int num_probes, int unitsize, uint64_t samplerate) di->data_unitsize = unitsize; di->data_samplerate = samplerate; if ((ret = srd_instance_start(di, args) != SRD_OK)) - return ret; - - /* Run the start() method on all decoders up the stack from this one. */ - for (s = di->next_di; s; s = s->next) { - /* These don't need probes, unitsize and samplerate. */ - di = s->data; - if ((ret = srd_instance_start(di, args) != SRD_OK)) - return ret; - } + break; } Py_DecRef(args); - return SRD_OK; + return ret; } /* Feed logic samples to decoder session. */ @@ -591,9 +677,9 @@ int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf, uint64_t inbuflen GSList *d; int ret; - srd_dbg("srd: calling decode() on all instances with starting sample " - "number %"PRIu64", %"PRIu64" bytes at 0x%p", start_samplenum, - inbuflen, inbuf); + srd_dbg("Calling decode() on all instances with starting sample " + "number %"PRIu64", %"PRIu64" bytes at 0x%p", start_samplenum, + inbuflen, inbuf); for (d = di_list; d; d = d->next) { if ((ret = srd_instance_decode(start_samplenum, d->data, inbuf, @@ -609,7 +695,7 @@ int srd_register_callback(int output_type, void *cb) { struct srd_pd_callback *pd_cb; - srd_dbg("srd: registering new callback for output type %d", output_type); + srd_dbg("Registering new callback for output type %d.", output_type); if (!(pd_cb = g_try_malloc(sizeof(struct srd_pd_callback)))) return SRD_ERR_MALLOC; @@ -641,13 +727,12 @@ void *srd_find_callback(int output_type) /* This is the backend function to python sigrokdecode.add() call. */ -int pd_add(struct srd_decoder_instance *di, int output_type, - char *proto_id) +int pd_add(struct srd_decoder_instance *di, int output_type, char *proto_id) { struct srd_pd_output *pdo; - srd_dbg("srd: instance %s creating new output type %d for %s", - di->instance_id, output_type, proto_id); + srd_dbg("Instance %s creating new output type %d for %s.", + di->instance_id, output_type, proto_id); if (!(pdo = g_try_malloc(sizeof(struct srd_pd_output)))) return -1; @@ -655,30 +740,10 @@ int pd_add(struct srd_decoder_instance *di, int output_type, /* pdo_id is just a simple index, nothing is deleted from this list anyway. */ pdo->pdo_id = g_slist_length(di->pd_output); pdo->output_type = output_type; - pdo->decoder = di->decoder; + pdo->di = di; pdo->proto_id = g_strdup(proto_id); di->pd_output = g_slist_append(di->pd_output, pdo); return pdo->pdo_id; } -struct srd_decoder_instance *get_di_by_decobject(void *decobject) -{ - GSList *l, *s; - struct srd_decoder_instance *di; - - for (l = di_list; l; l = l->next) { - di = l->data; - if (decobject == di->py_instance) - return di; - /* Check decoders stacked on top of this one. */ - for (s = di->next_di; s; s = s->next) { - di = s->data; - if (decobject == di->py_instance) - return di; - } - } - - return NULL; -} -