Various log message improvements.

3 files changed, 21 insertions, 21 deletions

diff --git a/instance.c b/instance.c
index b964534..99caabb 100644
--- a/instance.c
+++ b/instance.c
@@ -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;
@@ -412,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;
 }
@@ -508,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;
 }
@@ -637,7 +636,6 @@ static 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);
@@ -667,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();
 
@@ -1028,9 +1025,9 @@ 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;
@@ -1262,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);
 	}
diff --git a/session.c b/session.c
index 73fdc08..23e19b8 100644
--- a/session.c
+++ b/session.c
@@ -70,7 +70,7 @@ SRD_API int srd_session_new(struct srd_session **sess)
 	/* Keep a list of all sessions, so we can clean up as needed. */
 	sessions = g_slist_append(sessions, *sess);
 
-	srd_dbg("Created session %d.", (*sess)->session_id);
+	srd_dbg("Creating session %d.", (*sess)->session_id);
 
 	return SRD_OK;
 }
@@ -96,9 +96,9 @@ SRD_API int srd_session_start(struct srd_session *sess)
 	if (!sess)
 		return SRD_ERR_ARG;
 
-	srd_dbg("Calling start() on all instances in session %d.", sess->session_id);
+	srd_dbg("Calling start() of all instances in session %d.", sess->session_id);
 
-	/* Run the start() method on all decoders receiving frontend data. */
+	/* Run the start() method of all decoders receiving frontend data. */
 	ret = SRD_OK;
 	for (d = sess->di_list; d; d = d->next) {
 		di = d->data;
diff --git a/type_decoder.c b/type_decoder.c
index 2ce7fc1..b04747e 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: