X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=instance.c;h=23732ddb3ad1645825aa389c61d2dfa413055206;hp=db6cbcaf9fb8d80351f100ac68d9f6b2227a9927;hb=0102e92b4979de776cdabf50fcff69d8c95f30ca;hpb=9337ab8aff2ddcba3ad57eec78df35c86221fc82 diff --git a/instance.c b/instance.c index db6cbca..23732dd 100644 --- a/instance.c +++ b/instance.c @@ -30,11 +30,6 @@ extern SRD_PRIV GSList *sessions; -static void srd_inst_join_decode_thread(struct srd_decoder_inst *di); -static void srd_inst_reset_state(struct srd_decoder_inst *di); -SRD_PRIV void oldpins_array_seed(struct srd_decoder_inst *di); -SRD_PRIV void oldpins_array_free(struct srd_decoder_inst *di); - /** @endcond */ /** @@ -51,6 +46,36 @@ SRD_PRIV void oldpins_array_free(struct srd_decoder_inst *di); * @{ */ +static void oldpins_array_seed(struct srd_decoder_inst *di) +{ + size_t count; + GArray *arr; + + if (!di) + return; + if (di->old_pins_array) + return; + + count = di->dec_num_channels; + arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count); + g_array_set_size(arr, count); + memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count); + di->old_pins_array = arr; +} + +static void oldpins_array_free(struct srd_decoder_inst *di) +{ + if (!di) + return; + if (!di->old_pins_array) + return; + + srd_dbg("%s: Releasing initial pin state.", di->inst_id); + + g_array_free(di->old_pins_array, TRUE); + di->old_pins_array = NULL; +} + /** * Set one or more options in a decoder instance. * @@ -314,7 +339,6 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess, PyGILState_STATE gstate; i = 1; - srd_dbg("Creating new %s instance.", decoder_id); if (!sess) return NULL; @@ -398,6 +422,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess, di->got_new_samples = FALSE; di->handled_all_samples = FALSE; di->want_wait_terminate = FALSE; + di->decoder_state = SRD_OK; /* * Strictly speaking initialization of statically allocated @@ -411,7 +436,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess, /* Instance takes input from a frontend by default. */ sess->di_list = g_slist_append(sess->di_list, di); - srd_dbg("Created new %s instance with ID %s.", decoder_id, di->inst_id); + srd_dbg("Creating new %s instance %s.", decoder_id, di->inst_id); return di; } @@ -471,6 +496,7 @@ static void srd_inst_reset_state(struct srd_decoder_inst *di) di->got_new_samples = FALSE; di->handled_all_samples = FALSE; di->want_wait_terminate = FALSE; + di->decoder_state = SRD_OK; /* Conditions and mutex got reset after joining the thread. */ } @@ -503,10 +529,31 @@ SRD_API int srd_inst_stack(struct srd_session *sess, sess->di_list = g_slist_remove(sess->di_list, di_top); } + /* + * Check if there's at least one matching input/output pair + * for the stacked PDs. We warn if that's not the case, but it's + * not a hard error for the time being. + */ + gboolean at_least_one_match = FALSE; + for (GSList *out = di_bottom->decoder->outputs; out; out = out->next) { + const char *o = out->data; + for (GSList *in = di_top->decoder->inputs; in; in = in->next) { + const char *i = in->data; + if (!strcmp(o, i)) { + at_least_one_match = TRUE; + break; + } + } + } + + if (!at_least_one_match) + srd_warn("No matching in-/output when stacking %s onto %s.", + di_top->inst_id, di_bottom->inst_id); + /* Stack on top of source di. */ di_bottom->next_di = g_slist_append(di_bottom->next_di, di_top); - srd_dbg("Stacked %s onto %s.", di_top->inst_id, di_bottom->inst_id); + srd_dbg("Stacking %s onto %s.", di_top->inst_id, di_bottom->inst_id); return SRD_OK; } @@ -576,62 +623,6 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_id(struct srd_session *sess, return di; } -static struct srd_decoder_inst *srd_sess_inst_find_by_obj( - struct srd_session *sess, const GSList *stack, - const PyObject *obj) -{ - const GSList *l; - struct srd_decoder_inst *tmp, *di; - - if (!sess) - return NULL; - - di = NULL; - for (l = stack ? stack : sess->di_list; di == NULL && l != NULL; l = l->next) { - tmp = l->data; - if (tmp->py_inst == obj) - di = tmp; - else if (tmp->next_di) - di = srd_sess_inst_find_by_obj(sess, tmp->next_di, obj); - } - - return di; -} - -/** - * Find a decoder instance by its Python object. - * - * I.e. find that instance's instantiation of the sigrokdecode.Decoder class. - * This will recurse to find the instance anywhere in the stack tree of all - * sessions. - * - * @param stack Pointer to a GSList of struct srd_decoder_inst, 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_inst, or NULL if not found. - * - * @private - * - * @since 0.1.0 - */ -SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack, - const PyObject *obj) -{ - struct srd_decoder_inst *di; - struct srd_session *sess; - GSList *l; - - di = NULL; - for (l = sessions; di == NULL && l != NULL; l = l->next) { - sess = l->data; - di = srd_sess_inst_find_by_obj(sess, stack, obj); - } - - return di; -} - /** * Set the list of initial (assumed) pin values. * @@ -681,39 +672,6 @@ SRD_API int srd_inst_initial_pins_set_all(struct srd_decoder_inst *di, GArray *i return SRD_OK; } -/** @private */ -SRD_PRIV void oldpins_array_seed(struct srd_decoder_inst *di) -{ - size_t count; - GArray *arr; - - if (!di) - return; - if (di->old_pins_array) - return; - - srd_dbg("%s: Seeding old pins, %s().", di->inst_id, __func__); - count = di->dec_num_channels; - arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count); - g_array_set_size(arr, count); - memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count); - di->old_pins_array = arr; -} - -/** @private */ -SRD_PRIV void oldpins_array_free(struct srd_decoder_inst *di) -{ - if (!di) - return; - if (!di->old_pins_array) - return; - - srd_dbg("%s: Releasing initial pin state.", di->inst_id); - - g_array_free(di->old_pins_array, TRUE); - di->old_pins_array = NULL; -} - /** @private */ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di) { @@ -723,8 +681,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di) int ret; PyGILState_STATE gstate; - srd_dbg("Calling start() method on protocol decoder instance %s.", - di->inst_id); + srd_dbg("Calling start() of instance %s.", di->inst_id); gstate = PyGILState_Ensure(); @@ -1084,9 +1041,12 @@ static gpointer di_thread(gpointer data) * "Regular" termination of the decode() method is not expected. */ Py_IncRef(di->py_inst); - srd_dbg("%s: Calling decode() method.", di->inst_id); + srd_dbg("%s: Calling decode().", di->inst_id); py_res = PyObject_CallMethod(di->py_inst, "decode", NULL); - srd_dbg("%s: decode() method terminated.", di->inst_id); + srd_dbg("%s: decode() terminated.", di->inst_id); + + if (!py_res) + di->decoder_state = SRD_ERR; /* * Make sure to unblock potentially pending srd_inst_decode() @@ -1315,7 +1275,7 @@ SRD_PRIV int srd_inst_terminate_reset(struct srd_decoder_inst *di) */ gstate = PyGILState_Ensure(); if (PyObject_HasAttrString(di->py_inst, "reset")) { - srd_dbg("Calling .reset() of instance %s", di->inst_id); + srd_dbg("Calling reset() of instance %s", di->inst_id); py_ret = PyObject_CallMethod(di->py_inst, "reset", NULL); Py_XDECREF(py_ret); } @@ -1328,7 +1288,7 @@ SRD_PRIV int srd_inst_terminate_reset(struct srd_decoder_inst *di) return ret; } - return SRD_OK; + return di->decoder_state; } /** @private */