<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/24845">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: unify and enrich decoding error messages<br><br>Regarding the removal of burst_mask2str() from the TCH/H handler,<br>it does not make sense to print it because the mask is already<br>shifted and an earlier logging should already contain this info.<br><br>Change-Id: I42d20e2da73c21ca366dd246244cd716c8ccb459<br>Related: OS#4823<br>---<br>M src/host/trxcon/sched_lchan_pdtch.c<br>M src/host/trxcon/sched_lchan_tchf.c<br>M src/host/trxcon/sched_lchan_tchh.c<br>M src/host/trxcon/sched_lchan_xcch.c<br>4 files changed, 8 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/24845/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_pdtch.c b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>index abbd480..bd02865 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_pdtch.c</span><br><span>@@ -99,11 +99,8 @@</span><br><span>    rc = gsm0503_pdtch_decode(l2, buffer,</span><br><span>                NULL, &n_errors, &n_bits_total);</span><br><span>     if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DSCHD, LOGL_ERROR, "Received bad packet data frame "</span><br><span style="color: hsl(0, 100%, 40%);">-                     "at fn=%u (%u/%u) for %s\n", lchan->meas_avg.fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                   lchan->meas_avg.fn % ts->mf_layout->period,</span><br><span style="color: hsl(0, 100%, 40%);">-                    ts->mf_layout->period,</span><br><span style="color: hsl(0, 100%, 40%);">-                    lchan_desc->name);</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                   lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);</span><br><span>        }</span><br><span> </span><br><span>        /* Determine L2 length */</span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>index 1e38e96..0b38ea1 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchf.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchf.c</span><br><span>@@ -125,8 +125,8 @@</span><br><span> </span><br><span>     /* Check decoding result */</span><br><span>  if (rc < 4) {</span><br><span style="color: hsl(0, 100%, 40%);">-                LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame ending at "</span><br><span style="color: hsl(0, 100%, 40%);">-                   "fn=%u for %s\n", fn, lchan_desc->name);</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                   lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);</span><br><span> </span><br><span>            /* Send BFI */</span><br><span>               goto bfi;</span><br><span>diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c</span><br><span>index 6a5c471..1079bb0 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_tchh.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_tchh.c</span><br><span>@@ -295,9 +295,8 @@</span><br><span>                 /* Calculate AVG of the measurements (assuming 4 bursts) */</span><br><span>          sched_trx_meas_avg(lchan, 4);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-               LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame (%s) "</span><br><span style="color: hsl(0, 100%, 40%);">-                        "at fn=%u on %s (rc=%d)\n", burst_mask2str(mask, 6),</span><br><span style="color: hsl(0, 100%, 40%);">-                  lchan->meas_avg.fn, lchan_desc->name, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                   lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);</span><br><span> </span><br><span>            /* Send BFI */</span><br><span>               goto bfi;</span><br><span>diff --git a/src/host/trxcon/sched_lchan_xcch.c b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>index 41677ec..78397fe 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_xcch.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_xcch.c</span><br><span>@@ -100,11 +100,8 @@</span><br><span>        /* Attempt to decode */</span><br><span>      rc = gsm0503_xcch_decode(l2, buffer, &n_errors, &n_bits_total);</span><br><span>      if (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">-               LOGP(DSCHD, LOGL_ERROR, "Received bad data frame at fn=%u "</span><br><span style="color: hsl(0, 100%, 40%);">-                   "(%u/%u) for %s\n", lchan->meas_avg.fn,</span><br><span style="color: hsl(0, 100%, 40%);">-                    lchan->meas_avg.fn % ts->mf_layout->period,</span><br><span style="color: hsl(0, 100%, 40%);">-                    ts->mf_layout->period,</span><br><span style="color: hsl(0, 100%, 40%);">-                    lchan_desc->name);</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGP(DSCHD, LOGL_ERROR, "Received bad %s frame (rc=%d, ber=%d/%d) at fn=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                   lchan_desc->name, rc, n_errors, n_bits_total, lchan->meas_avg.fn);</span><br><span> </span><br><span>            /**</span><br><span>           * We should anyway send dummy frame for</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/24845">change 24845</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/24845"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I42d20e2da73c21ca366dd246244cd716c8ccb459 </div>
<div style="display:none"> Gerrit-Change-Number: 24845 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>