Change in osmocom-bb[master]: trxcon/scheduler: unify and enrich decoding error messages

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/24845 )

Change subject: trxcon/scheduler: unify and enrich decoding error messages
......................................................................

trxcon/scheduler: unify and enrich decoding error messages

Regarding the removal of burst_mask2str() from the TCH/H handler,
it does not make sense to print it because the mask is already
shifted and an earlier logging should already contain this info.

Change-Id: I42d20e2da73c21ca366dd246244cd716c8ccb459
Related: OS#4823
---
M src/host/trxcon/sched_lchan_pdtch.c
M src/host/trxcon/sched_lchan_tchf.c
M src/host/trxcon/sched_lchan_tchh.c
M src/host/trxcon/sched_lchan_xcch.c
4 files changed, 8 insertions(+), 15 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c
index abbd480..bd02865 100644
--- a/src/host/trxcon/sched_lchan_pdtch.c
+++ b/src/host/trxcon/sched_lchan_pdtch.c
@@ -99,11 +99,8 @@
 	rc = gsm0503_pdtch_decode(l2, buffer,
 		NULL, &n_errors, &n_bits_total);
 	if (rc < 0) {
-		LOGP(DSCHD, LOGL_ERROR, "Received bad packet data frame "
-			"at fn=%u (%u/%u) for %s\n", lchan->meas_avg.fn,
-			lchan->meas_avg.fn % ts->mf_layout->period,
-			ts->mf_layout->period,
-			lchan_desc->name);
+		LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
+		     lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
 	}
 
 	/* Determine L2 length */
diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c
index 1e38e96..0b38ea1 100644
--- a/src/host/trxcon/sched_lchan_tchf.c
+++ b/src/host/trxcon/sched_lchan_tchf.c
@@ -125,8 +125,8 @@
 
 	/* Check decoding result */
 	if (rc < 4) {
-		LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame ending at "
-			"fn=%u for %s\n", fn, lchan_desc->name);
+		LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
+		     lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
 
 		/* Send BFI */
 		goto bfi;
diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c
index 6a5c471..1079bb0 100644
--- a/src/host/trxcon/sched_lchan_tchh.c
+++ b/src/host/trxcon/sched_lchan_tchh.c
@@ -295,9 +295,8 @@
 		/* Calculate AVG of the measurements (assuming 4 bursts) */
 		sched_trx_meas_avg(lchan, 4);
 
-		LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame (%s) "
-			"at fn=%u on %s (rc=%d)\n", burst_mask2str(mask, 6),
-			lchan->meas_avg.fn, lchan_desc->name, rc);
+		LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
+		     lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
 
 		/* Send BFI */
 		goto bfi;
diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c
index 41677ec..78397fe 100644
--- a/src/host/trxcon/sched_lchan_xcch.c
+++ b/src/host/trxcon/sched_lchan_xcch.c
@@ -100,11 +100,8 @@
 	/* Attempt to decode */
 	rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total);
 	if (rc) {
-		LOGP(DSCHD, LOGL_ERROR, "Received bad data frame at fn=%u "
-			"(%u/%u) for %s\n", lchan->meas_avg.fn,
-			lchan->meas_avg.fn % ts->mf_layout->period,
-			ts->mf_layout->period,
-			lchan_desc->name);
+		LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",
+		     lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);
 
 		/**
 		 * We should anyway send dummy frame for

-- 
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/24845
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I42d20e2da73c21ca366dd246244cd716c8ccb459
Gerrit-Change-Number: 24845
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210705/3fffdf28/attachment.htm>