<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10308">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Clarify frame loss counter for l1sched_chan_state<br><br>Each logical channel (e.g. SACCH, SDCCH, etc.) has a counter of<br>lost L2 frames. Let's use a bit better name for it, and correct<br>its description in the 'l1sched_chan_state' struct definition.<br><br>Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82<br>---<br>M include/osmo-bts/scheduler.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>M src/osmo-bts-virtual/scheduler_virtbts.c<br>4 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h</span><br><span>index 98f38d3..3fe7978 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -78,7 +78,7 @@</span><br><span> int32_t toa256_sum; /* sum of TOA values (1/256 symbol) */</span><br><span> </span><br><span> /* loss detection */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t lost; /* (SACCH) loss detection */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t lost_frames; /* how many L2 frames were lost */</span><br><span> </span><br><span> /* mode */</span><br><span> uint8_t rsl_cmode, tch_mode; /* mode for TCH channels */</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 3842810..5c250e4 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -367,7 +367,7 @@</span><br><span> memcpy(msg->l2h, l2, l2_len);</span><br><span> </span><br><span> if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id))</span><br><span style="color: hsl(0, 100%, 40%);">- l1ts->chan_state[chan].lost = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->chan_state[chan].lost_frames = 0;</span><br><span> </span><br><span> /* forward primitive */</span><br><span> l1sap_up(l1t->trx, l1sap);</span><br><span>@@ -396,8 +396,8 @@</span><br><span> if (tch_len)</span><br><span> memcpy(msg->l2h, tch, tch_len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (l1ts->chan_state[chan].lost)</span><br><span style="color: hsl(0, 100%, 40%);">- l1ts->chan_state[chan].lost--;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1ts->chan_state[chan].lost_frames)</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->chan_state[chan].lost_frames--;</span><br><span> </span><br><span> LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, -1, l1sap->u.data.fn,</span><br><span> "%s Rx -> RTP: %s\n",</span><br><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index a22b53f..4ab937a 100644</span><br><span>--- a/src/osmo-bts-trx/scheduler_trx.c</span><br><span>+++ b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>@@ -192,7 +192,7 @@</span><br><span> /* handle loss detection of SACCH */</span><br><span> if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) {</span><br><span> /* count and send BFI */</span><br><span style="color: hsl(0, 100%, 40%);">- if (++(l1ts->chan_state[chan].lost) > 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (++(l1ts->chan_state[chan].lost_frames) > 1) {</span><br><span> /* TODO: Should we pass old TOA here? Otherwise we risk</span><br><span> * unnecessary decreasing TA */</span><br><span> </span><br><span>@@ -351,7 +351,7 @@</span><br><span> </span><br><span> /* handle loss detection of received TCH frames */</span><br><span> if (rsl_cmode == RSL_CMOD_SPD_SPEECH</span><br><span style="color: hsl(0, 100%, 40%);">- && ++(chan_state->lost) > 5) {</span><br><span style="color: hsl(120, 100%, 40%);">+ && ++(chan_state->lost_frames) > 5) {</span><br><span> uint8_t tch_data[GSM_FR_BYTES];</span><br><span> int len;</span><br><span> </span><br><span>diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>index de995e6..cdbb9c1 100644</span><br><span>--- a/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>+++ b/src/osmo-bts-virtual/scheduler_virtbts.c</span><br><span>@@ -198,7 +198,7 @@</span><br><span> #if 0</span><br><span> /* handle loss detection of received TCH frames */</span><br><span> if (rsl_cmode == RSL_CMOD_SPD_SPEECH</span><br><span style="color: hsl(0, 100%, 40%);">- && ++(chan_state->lost) > 5) {</span><br><span style="color: hsl(120, 100%, 40%);">+ && ++(chan_state->lost_frames) > 5) {</span><br><span> uint8_t tch_data[GSM_FR_BYTES];</span><br><span> int len;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10308">change 10308</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/10308"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82 </div>
<div style="display:none"> Gerrit-Change-Number: 10308 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>