<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25058">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: Reimplement rlcmac_diag() and make it available from C<br><br>We never use the std:string anyway, we always call .c_str() to log using<br>osmocom logging system.<br>Furthermore, we'll need to use it from C code soon (next commit).<br><br>Change-Id: I3ad66f9f3f4d55d11da3a3b8b38656ae2dd50603<br>---<br>M src/tbf.cpp<br>M src/tbf.h<br>2 files changed, 28 insertions(+), 27 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 498c69b..88aa049 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -446,7 +446,7 @@</span><br><span> {</span><br><span> if (run_diag) {</span><br><span> LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(tbf_timers_names, t), tbf->rlcmac_diag().c_str());</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(tbf_timers_names, t), tbf_rlcmac_diag(tbf));</span><br><span> } else {</span><br><span> LOGPTBF(tbf, LOGL_NOTICE, "%s timeout expired, freeing TBF\n",</span><br><span> get_value_string(tbf_timers_names, t));</span><br><span>@@ -610,7 +610,7 @@</span><br><span> if (!ul_tbf->ctrl_ack_to_toggle()) {</span><br><span> LOGPTBF(this, LOGL_NOTICE,</span><br><span> "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ACK: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rlcmac_diag().c_str());</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_rlcmac_diag(this));</span><br><span> }</span><br><span> bts_do_rate_ctr_inc(bts, CTR_RLC_ACK_TIMEDOUT);</span><br><span> bts_do_rate_ctr_inc(bts, CTR_PUAN_POLL_TIMEDOUT);</span><br><span>@@ -628,7 +628,7 @@</span><br><span> if (!(state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS))) {</span><br><span> LOGPTBF(this, LOGL_NOTICE,</span><br><span> "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rlcmac_diag().c_str());</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_rlcmac_diag(this));</span><br><span> state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS);</span><br><span> }</span><br><span> bts_do_rate_ctr_inc(bts, CTR_RLC_ASS_TIMEDOUT);</span><br><span>@@ -645,7 +645,7 @@</span><br><span> if (!(state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS))) {</span><br><span> LOGPTBF(this, LOGL_NOTICE,</span><br><span> "Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rlcmac_diag().c_str());</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_rlcmac_diag(this));</span><br><span> state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS);</span><br><span> }</span><br><span> dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE;</span><br><span>@@ -670,7 +670,7 @@</span><br><span> if (!(dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) {</span><br><span> LOGPTBF(this, LOGL_NOTICE,</span><br><span> "Timeout for polling PACKET DOWNLINK ACK: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- dl_tbf->rlcmac_diag().c_str());</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_rlcmac_diag(dl_tbf));</span><br><span> dl_tbf->state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK);</span><br><span> }</span><br><span> </span><br><span>@@ -800,26 +800,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-std::string gprs_rlcmac_tbf::rlcmac_diag()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- std::ostringstream os;</span><br><span style="color: hsl(0, 100%, 40%);">- os << "|";</span><br><span style="color: hsl(0, 100%, 40%);">- if ((state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)))</span><br><span style="color: hsl(0, 100%, 40%);">- os << "Assignment was on CCCH|";</span><br><span style="color: hsl(0, 100%, 40%);">- if ((state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH)))</span><br><span style="color: hsl(0, 100%, 40%);">- os << "Assignment was on PACCH|";</span><br><span style="color: hsl(0, 100%, 40%);">- if ((state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA)))</span><br><span style="color: hsl(0, 100%, 40%);">- os << "Uplink data was received|";</span><br><span style="color: hsl(0, 100%, 40%);">- else if (direction == GPRS_RLCMAC_UL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">- os << "No uplink data received yet|";</span><br><span style="color: hsl(0, 100%, 40%);">- if ((state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK)))</span><br><span style="color: hsl(0, 100%, 40%);">- os << "Downlink ACK was received|";</span><br><span style="color: hsl(0, 100%, 40%);">- else if (direction == GPRS_RLCMAC_DL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">- os << "No downlink ACK received yet|";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return os.str();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct msgb *gprs_rlcmac_tbf::create_dl_ass(uint32_t fn, uint8_t ts)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span>@@ -1111,3 +1091,25 @@</span><br><span> {</span><br><span> tbf->poll_timeout(pdch, poll_fn, reason);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const char* tbf_rlcmac_diag(const struct gprs_rlcmac_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static char buf[256];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "|");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "Assignment was on CCCH|");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "Assignment was on PACCH|");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA))</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "Uplink data was received|");</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (tbf->direction == GPRS_RLCMAC_UL_TBF)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "No uplink data received yet|");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "Downlink ACK was received|");</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (tbf->direction == GPRS_RLCMAC_DL_TBF)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "No downlink ACK received yet|");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 3313255..da683b6 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -173,6 +173,7 @@</span><br><span> void tbf_set_polling(struct gprs_rlcmac_tbf *tbf, uint32_t new_poll_fn, uint8_t ts, enum pdch_ulc_tbf_poll_reason t);</span><br><span> void tbf_poll_timeout(struct gprs_rlcmac_tbf *tbf, struct gprs_rlcmac_pdch *pdch, uint32_t poll_fn, enum pdch_ulc_tbf_poll_reason reason);</span><br><span> void tbf_update_state_fsm_name(struct gprs_rlcmac_tbf *tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+const char* tbf_rlcmac_diag(const struct gprs_rlcmac_tbf *tbf);</span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span> #endif</span><br><span>@@ -207,8 +208,6 @@</span><br><span> </span><br><span> uint8_t tsc() const;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- std::string rlcmac_diag();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> bool n_inc(enum tbf_counters n);</span><br><span> void n_reset(enum tbf_counters n);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25058">change 25058</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/+/25058"/><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: I3ad66f9f3f4d55d11da3a3b8b38656ae2dd50603 </div>
<div style="display:none"> Gerrit-Change-Number: 25058 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>