X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=type_decoder.c;h=cde2900b01a22f083539d0f751e82a7fa9633212;hb=4ed2129f32db35032aed0ce7675babdbb91eeea9;hp=2ce7fc15740a74573f52d2a33e57be51ee9c4919;hpb=5c723a57ebf09047b0fad0adab0f99c20e1b7d99;p=libsigrokdecode.git

diff --git a/type_decoder.c b/type_decoder.c
index 2ce7fc1..cde2900 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -355,9 +355,10 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 
 	/* 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.",
-			 di->inst_id, start_sample, end_sample,
-			 output_type_name(pdo->output_type), output_id);
+		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;
@@ -384,10 +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("Instance %s put %" PRIu64 "-%" PRIu64 " %s on "
-				 "oid %d to instance %s.", di->inst_id, start_sample,
+			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, next_di->inst_id);
+				 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))) {
@@ -519,9 +521,6 @@ static PyObject *Decoder_register(PyObject *self, PyObject *args,
 		return py_new_output_id;
 	}
 
-	srd_dbg("Instance %s creating new output type %s for %s.",
-		di->inst_id, output_type_name(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. */
@@ -541,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:
@@ -847,7 +850,7 @@ static PyObject *Decoder_wait(PyObject *self, PyObject *args)
 	unsigned int i;
 	gboolean found_match;
 	struct srd_decoder_inst *di;
-	PyObject *py_pinvalues, *py_matched;
+	PyObject *py_pinvalues, *py_matched, *py_samplenum;
 	PyGILState_STATE gstate;
 
 	if (!self || !args)
@@ -914,14 +917,16 @@ static PyObject *Decoder_wait(PyObject *self, PyObject *args)
 		/* If there's a match, set self.samplenum etc. and return. */
 		if (found_match) {
 			/* Set self.samplenum to the (absolute) sample number that matched. */
-			PyObject_SetAttrString(di->py_inst, "samplenum",
-				PyLong_FromLong(di->abs_cur_samplenum));
+			py_samplenum = PyLong_FromLong(di->abs_cur_samplenum);
+			PyObject_SetAttrString(di->py_inst, "samplenum", py_samplenum);
+			Py_DECREF(py_samplenum);
 
 			if (di->match_array && di->match_array->len > 0) {
 				py_matched = PyTuple_New(di->match_array->len);
 				for (i = 0; i < di->match_array->len; i++)
 					PyTuple_SetItem(py_matched, i, PyBool_FromLong(di->match_array->data[i]));
 				PyObject_SetAttrString(di->py_inst, "matched", py_matched);
+				Py_DECREF(py_matched);
 				match_array_free(di);
 			} else {
 				PyObject_SetAttrString(di->py_inst, "matched", Py_None);