<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22105">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
keith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: remove 'software error' logs from tbf_free<br><br>It is expected that the tbf object is freed at any moment in time, for<br>instance if osmo-pcu drops PCUIF connection with osmo-bts. I couldn't<br>find any reason why it would e dangerous to free the tbf, so let's<br>remove this message.<br><br>related: OS#4779<br>Change-Id: I4ab5ccaa5bf6257b18d8fd5ba06baab083821817<br>---<br>M src/tbf.cpp<br>M src/tbf.h<br>M tests/tbf/TbfTest.err<br>3 files changed, 0 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 28e24b8..6dcd954 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -301,7 +301,6 @@</span><br><span> }</span><br><span> </span><br><span> LOGPTBF(tbf, LOGL_INFO, "free\n");</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->check_pending_ass();</span><br><span> tbf->stop_timers("freeing TBF");</span><br><span> /* TODO: Could/Should generate bssgp_tx_llc_discarded */</span><br><span> tbf_unlink_pdch(tbf);</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 72b5cf0..d767547 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -233,7 +233,6 @@</span><br><span> void set_ack_state(enum gprs_rlcmac_tbf_ul_ack_state new_state, const char *file, int line);</span><br><span> void poll_sched_set(const char *file, int line);</span><br><span> void poll_sched_unset(const char *file, int line);</span><br><span style="color: hsl(0, 100%, 40%);">- void check_pending_ass();</span><br><span> bool check_n_clear(uint8_t state_flag);</span><br><span> void set_assigned_on(uint8_t state_flag, bool check_ccch, const char *file, int line);</span><br><span> void ass_type_mod(uint8_t t, bool unset, const char *file, int line);</span><br><span>@@ -513,21 +512,6 @@</span><br><span> poll_state = GPRS_RLCMAC_POLL_NONE;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inline void gprs_rlcmac_tbf::check_pending_ass()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (ul_ass_state != GPRS_RLCMAC_UL_ASS_NONE)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF(this, LOGL_ERROR, "FIXME: Software error: Pending uplink assignment in state %s. "</span><br><span style="color: hsl(0, 100%, 40%);">- "This may not happen, because the assignment message never gets transmitted. "</span><br><span style="color: hsl(0, 100%, 40%);">- "Please be sure not to free in this state. PLEASE FIX!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_rlcmac_tbf_ul_ass_state_names, ul_ass_state));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (dl_ass_state != GPRS_RLCMAC_DL_ASS_NONE)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF(this, LOGL_ERROR, "FIXME: Software error: Pending downlink assignment in state %s. "</span><br><span style="color: hsl(0, 100%, 40%);">- "This may not happen, because the assignment message never gets transmitted. "</span><br><span style="color: hsl(0, 100%, 40%);">- "Please be sure not to free in this state. PLEASE FIX!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gprs_rlcmac_tbf_dl_ass_state_names, dl_ass_state));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> inline bool gprs_rlcmac_tbf::check_n_clear(uint8_t state_flag)</span><br><span> {</span><br><span> if ((state_flags & (1 << state_flag))) {</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index fa5fd47..4d27cc9 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -521,7 +521,6 @@</span><br><span> MS(TLLI=0xf1000002, IMSI=, TA=0, 45/0, DL) IMSI '001001000000002' was already assigned to another MS object: TLLI = 0xf1000001, that IMSI will be removed</span><br><span> TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=FLOW) changes state from FLOW to RELEASING</span><br><span> TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=RELEASING) free</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=RELEASING) FIXME: Software error: Pending downlink assignment in state GPRS_RLCMAC_DL_ASS_SEND_ASS. This may not happen, because the assignment message never gets transmitted. Please be sure not to free in this state. PLEASE FIX!</span><br><span> PDCH(TS 4, TRX 0): Detaching TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=RELEASING), 1 TBFs, USFs = 00, TFIs = 00000002.</span><br><span> Detaching TBF from MS object, TLLI = 0xf1000001, TBF = TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=RELEASING)</span><br><span> ********** DL-TBF ends here **********</span><br><span>@@ -529,7 +528,6 @@</span><br><span> Destroying MS object, TLLI = 0xffffffff</span><br><span> TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=FLOW) changes state from FLOW to RELEASING</span><br><span> TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=RELEASING) free</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=RELEASING) FIXME: Software error: Pending downlink assignment in state GPRS_RLCMAC_DL_ASS_SEND_ASS. This may not happen, because the assignment message never gets transmitted. Please be sure not to free in this state. PLEASE FIX!</span><br><span> PDCH(TS 4, TRX 0): Detaching TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=RELEASING), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span> Detaching TBF from MS object, TLLI = 0xf1000002, TBF = TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=RELEASING)</span><br><span> Destroying MS object, TLLI = 0xf1000002</span><br><span>@@ -1860,7 +1858,6 @@</span><br><span> Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2</span><br><span> MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, UL DL) UL RSSI: 31 dBm</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) free</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) FIXME: Software error: Pending downlink assignment in state GPRS_RLCMAC_DL_ASS_SEND_ASS. This may not happen, because the assignment message never gets transmitted. Please be sure not to free in this state. PLEASE FIX!</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) stopping timer T3169 [freeing TBF]</span><br><span> PDCH(TS 7, TRX 0): Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span> Detaching TBF from MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW)</span><br><span>@@ -1999,7 +1996,6 @@</span><br><span> Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2</span><br><span> MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, UL DL) UL RSSI: 31 dBm</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) free</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) FIXME: Software error: Pending downlink assignment in state GPRS_RLCMAC_DL_ASS_SEND_ASS. This may not happen, because the assignment message never gets transmitted. Please be sure not to free in this state. PLEASE FIX!</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) stopping timer T3169 [freeing TBF]</span><br><span> PDCH(TS 7, TRX 0): Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span> Detaching TBF from MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW)</span><br><span>@@ -6023,7 +6019,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) V(B): (V(A)=1186)"NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNAAANAAAAAAAAAAAAAAAAAAAAAAAAAA"(V(S)-1=1287) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) changes state from FLOW to RELEASING</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=RELEASING EGPRS) free</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=RELEASING EGPRS) FIXME: Software error: Pending downlink assignment in state GPRS_RLCMAC_DL_ASS_SEND_ASS. This may not happen, because the assignment message never gets transmitted. Please be sure not to free in this state. PLEASE FIX!</span><br><span> PDCH(TS 4, TRX 0): Detaching TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=RELEASING EGPRS), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span> Detaching TBF from MS object, TLLI = 0xffeeddcc, TBF = TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=RELEASING EGPRS)</span><br><span> Destroying MS object, TLLI = 0xffeeddcc</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22105">change 22105</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/osmo-pcu/+/22105"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4ab5ccaa5bf6257b18d8fd5ba06baab083821817 </div>
<div style="display:none"> Gerrit-Change-Number: 22105 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>