X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=instance.c;h=99caabbe882f3da561d3f7dca3414b4a7ba2cb23;hp=ab1e0a21d0b9b199e73a622418e1ce8e0b14fcc5;hb=2dfe09863649bcf85e7e0c977886c243ebab19ad;hpb=4ccebbd355fb53177dcc46476a5e5105f4859410

diff --git a/instance.c b/instance.c
index ab1e0a2..99caabb 100644
--- a/instance.c
+++ b/instance.c
@@ -32,8 +32,8 @@ 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);
+static void oldpins_array_seed(struct srd_decoder_inst *di);
+static void oldpins_array_free(struct srd_decoder_inst *di);
 
 /** @endcond */
 
@@ -314,7 +314,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 +397,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 +411,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 +471,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. */
 }
 
@@ -506,7 +507,7 @@ SRD_API int srd_inst_stack(struct srd_session *sess,
 	/* 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 +577,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,8 +626,7 @@ 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)
+static void oldpins_array_seed(struct srd_decoder_inst *di)
 {
 	size_t count;
 	GArray *arr;
@@ -692,7 +636,6 @@ SRD_PRIV void oldpins_array_seed(struct srd_decoder_inst *di)
 	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);
@@ -700,8 +643,7 @@ SRD_PRIV void oldpins_array_seed(struct srd_decoder_inst *di)
 	di->old_pins_array = arr;
 }
 
-/** @private */
-SRD_PRIV void oldpins_array_free(struct srd_decoder_inst *di)
+static void oldpins_array_free(struct srd_decoder_inst *di)
 {
 	if (!di)
 		return;
@@ -723,8 +665,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();
 
@@ -771,7 +712,8 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
  *
  * @private
  */
-static gboolean sample_matches(uint8_t old_sample, uint8_t sample, struct srd_term *term)
+__attribute__((always_inline))
+static inline gboolean sample_matches(uint8_t old_sample, uint8_t sample, struct srd_term *term)
 {
 	/* Caller ensures term != NULL. */
 
@@ -1083,9 +1025,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()
@@ -1314,7 +1259,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);
 	}
@@ -1327,7 +1272,7 @@ SRD_PRIV int srd_inst_terminate_reset(struct srd_decoder_inst *di)
 			return ret;
 	}
 
-	return SRD_OK;
+	return di->decoder_state;
 }
 
 /** @private */