X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=b04747e8f784716074b46462fbe5faa628cc8fca;hp=324d2ef34e3066f679e8038cacbd0db141cdd81f;hb=4c58713b0d536f37b8630ebd142185aa56946335;hpb=a4e9ca6fd0800d3b850f41198bd8049f5a9607de

diff --git a/type_decoder.c b/type_decoder.c
index 324d2ef..b04747e 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -31,7 +31,7 @@ typedef struct {
 } srd_Decoder;
 
 /* This is only used for nicer srd_dbg() output. */
-static const char *output_type_name(unsigned int idx)
+SRD_PRIV const char *output_type_name(unsigned int idx)
 {
 	static const char names[][16] = {
 		"OUTPUT_ANN",
@@ -50,7 +50,6 @@ static void release_annotation(struct srd_proto_data_annotation *pda)
 		return;
 	if (pda->ann_text)
 		g_strfreev(pda->ann_text);
-	g_free(pda);
 }
 
 static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
@@ -110,10 +109,9 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 		goto err;
 	}
 
-	pda = g_malloc(sizeof(struct srd_proto_data_annotation));
+	pda = pdata->data;
 	pda->ann_class = ann_class;
 	pda->ann_text = ann_text;
-	pdata->data = pda;
 
 	PyGILState_Release(gstate);
 
@@ -130,7 +128,6 @@ static void release_binary(struct srd_proto_data_binary *pdb)
 	if (!pdb)
 		return;
 	g_free((void *)pdb->data);
-	g_free(pdb);
 }
 
 static int convert_binary(struct srd_decoder_inst *di, PyObject *obj,
@@ -194,15 +191,12 @@ static int convert_binary(struct srd_decoder_inst *di, PyObject *obj,
 
 	PyGILState_Release(gstate);
 
-	pdb = g_malloc(sizeof(struct srd_proto_data_binary));
+	pdb = pdata->data;
 	pdb->bin_class = bin_class;
 	pdb->size = size;
-	if (!(pdb->data = g_try_malloc(pdb->size))) {
-		g_free(pdb);
+	if (!(pdb->data = g_try_malloc(pdb->size)))
 		return SRD_ERR_MALLOC;
-	}
 	memcpy((void *)pdb->data, (const void *)buf, pdb->size);
-	pdata->data = pdb;
 
 	return SRD_OK;
 
@@ -212,7 +206,7 @@ err:
 	return SRD_ERR_PYTHON;
 }
 
-static struct srd_decoder_inst *srd_sess_inst_find_by_obj(
+static inline struct srd_decoder_inst *srd_sess_inst_find_by_obj(
 	struct srd_session *sess, const GSList *stack, const PyObject *obj)
 {
 	const GSList *l;
@@ -249,13 +243,19 @@ static struct srd_decoder_inst *srd_sess_inst_find_by_obj(
  *
  * @since 0.1.0
  */
-static struct srd_decoder_inst *srd_inst_find_by_obj(
+static inline 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;
 
+	/* Performance shortcut: Handle the most common case first. */
+	sess = sessions->data;
+	di = sess->di_list->data;
+	if (di->py_inst == obj)
+		return di;
+
 	di = NULL;
 	for (l = sessions; di == NULL && l != NULL; l = l->next) {
 		sess = l->data;
@@ -319,6 +319,8 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	struct srd_decoder_inst *di, *next_di;
 	struct srd_pd_output *pdo;
 	struct srd_proto_data pdata;
+	struct srd_proto_data_annotation pda;
+	struct srd_proto_data_binary pdb;
 	uint64_t start_sample, end_sample;
 	int output_id;
 	struct srd_pd_callback *cb;
@@ -351,9 +353,13 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	}
 	pdo = l->data;
 
-	srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s on oid %d.",
-		 di->inst_id, start_sample, end_sample,
-		 output_type_name(pdo->output_type), output_id);
+	/* Upon SRD_OUTPUT_PYTHON for stacked PDs, we have a nicer log message later. */
+	if (pdo->output_type != SRD_OUTPUT_PYTHON && di->next_di != NULL) {
+		srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s on "
+			 "oid %d (%s).", di->inst_id, start_sample, end_sample,
+			 output_type_name(pdo->output_type), output_id,
+			 pdo->proto_id);
+	}
 
 	pdata.start_sample = start_sample;
 	pdata.end_sample = end_sample;
@@ -364,6 +370,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	case SRD_OUTPUT_ANN:
 		/* Annotations are only fed to callbacks. */
 		if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {
+			pdata.data = &pda;
 			/* Convert from PyDict to srd_proto_data_annotation. */
 			if (convert_annotation(di, py_data, &pdata) != SRD_OK) {
 				/* An error was already logged. */
@@ -378,8 +385,11 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	case SRD_OUTPUT_PYTHON:
 		for (l = di->next_di; l; l = l->next) {
 			next_di = l->data;
-			srd_spew("Sending %" PRIu64 "-%" PRIu64 " to instance %s",
-				 start_sample, end_sample, next_di->inst_id);
+			srd_spew("Instance %s put %" PRIu64 "-%" PRIu64 " %s "
+				 "on oid %d (%s) to instance %s.", di->inst_id,
+				 start_sample,
+				 end_sample, output_type_name(pdo->output_type),
+				 output_id, pdo->proto_id, next_di->inst_id);
 			if (!(py_res = PyObject_CallMethod(
 				next_di->py_inst, "decode", "KKO", start_sample,
 				end_sample, py_data))) {
@@ -399,6 +409,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 		break;
 	case SRD_OUTPUT_BINARY:
 		if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {
+			pdata.data = &pdb;
 			/* Convert from PyDict to srd_proto_data_binary. */
 			if (convert_binary(di, py_data, &pdata) != SRD_OK) {
 				/* An error was already logged. */
@@ -510,9 +521,6 @@ static PyObject *Decoder_register(PyObject *self, PyObject *args,
 		return py_new_output_id;
 	}
 
-	srd_dbg("Instance %s creating new output type %d for %s.",
-		di->inst_id, output_type, proto_id);
-
 	pdo = g_malloc(sizeof(struct srd_pd_output));
 
 	/* pdo_id is just a simple index, nothing is deleted from this list anyway. */
@@ -532,6 +540,10 @@ static PyObject *Decoder_register(PyObject *self, PyObject *args,
 
 	PyGILState_Release(gstate);
 
+	srd_dbg("Instance %s creating new output type %s as oid %d (%s).",
+		di->inst_id, output_type_name(output_type), pdo->pdo_id,
+		proto_id);
+
 	return py_new_output_id;
 
 err: