<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15424">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: tbf: Rename T and N arrays<br><br>Those namings my collide with usual osmocom "T" variable name associated<br>to a timer number, which will be added in following patches.<br><br>Change-Id: Ic2b5068a4882e4a043bf81496be30a378fdb9a09<br>---<br>M src/tbf.cpp<br>M src/tbf.h<br>2 files changed, 20 insertions(+), 20 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 9856c7f..d3021e4 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -220,8 +220,8 @@</span><br><span> /* The classes of these members do not have proper constructors yet.</span><br><span> * Just set them to 0 like talloc_zero did */</span><br><span> memset(&pdch, 0, sizeof(pdch));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&T, 0, sizeof(T));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&N, 0, sizeof(N));</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&Tarr, 0, sizeof(Tarr));</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&Narr, 0, sizeof(Narr));</span><br><span> memset(&gsm_timer, 0, sizeof(gsm_timer));</span><br><span> </span><br><span> m_rlc.init();</span><br><span>@@ -563,7 +563,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- N[n] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ Narr[n] = 0;</span><br><span> }</span><br><span> </span><br><span> /* Increment counter and check for MAX value (return true if we hit it) */</span><br><span>@@ -577,7 +577,7 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- N[n]++;</span><br><span style="color: hsl(120, 100%, 40%);">+ Narr[n]++;</span><br><span> </span><br><span> switch(n) {</span><br><span> case N3101:</span><br><span>@@ -595,7 +595,7 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (N[n] == chk) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Narr[n] == chk) {</span><br><span> LOGPTBF(this, LOGL_NOTICE, "%s exceeded MAX (%u)\n",</span><br><span> get_value_string(tbf_counters_names, n), chk);</span><br><span> return true;</span><br><span>@@ -612,10 +612,10 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_timer_pending(&T[t])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_timer_pending(&Tarr[t])) {</span><br><span> LOGPTBF(this, LOGL_DEBUG, "stopping timer %s [%s]\n",</span><br><span> get_value_string(tbf_timers_names, t), reason);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&T[t]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&Tarr[t]);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -625,11 +625,11 @@</span><br><span> uint8_t i;</span><br><span> </span><br><span> if (t != T_MAX)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_timer_pending(&T[t]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_timer_pending(&Tarr[t]);</span><br><span> </span><br><span> /* we don't start with T0 because it's internal timer which requires special handling */</span><br><span> for (i = T3169; i < T_MAX; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_timer_pending(&T[i]))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_timer_pending(&Tarr[i]))</span><br><span> return true;</span><br><span> </span><br><span> return false;</span><br><span>@@ -672,37 +672,37 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!force && osmo_timer_pending(&T[t]))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!force && osmo_timer_pending(&Tarr[t]))</span><br><span> return;</span><br><span> </span><br><span> LOGPSRC(DTBF, LOGL_DEBUG, file, line, "%s %sstarting timer %s [%s] with %u sec. %u microsec, cur_fn=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_name(this), osmo_timer_pending(&T[t]) ? "re" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_name(this), osmo_timer_pending(&Tarr[t]) ? "re" : "",</span><br><span> get_value_string(tbf_timers_names, t), reason, sec, microsec, current_fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- T[t].data = this;</span><br><span style="color: hsl(120, 100%, 40%);">+ Tarr[t].data = this;</span><br><span> </span><br><span> switch(t) {</span><br><span> case T0:</span><br><span style="color: hsl(0, 100%, 40%);">- T[t].cb = tbf_timer_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ Tarr[t].cb = tbf_timer_cb;</span><br><span> break;</span><br><span> case T3169:</span><br><span style="color: hsl(0, 100%, 40%);">- T[t].cb = cb_T3169;</span><br><span style="color: hsl(120, 100%, 40%);">+ Tarr[t].cb = cb_T3169;</span><br><span> break;</span><br><span> case T3191:</span><br><span style="color: hsl(0, 100%, 40%);">- T[t].cb = cb_T3191;</span><br><span style="color: hsl(120, 100%, 40%);">+ Tarr[t].cb = cb_T3191;</span><br><span> break;</span><br><span> case T3193:</span><br><span style="color: hsl(0, 100%, 40%);">- T[t].cb = cb_T3193;</span><br><span style="color: hsl(120, 100%, 40%);">+ Tarr[t].cb = cb_T3193;</span><br><span> break;</span><br><span> case T3195:</span><br><span style="color: hsl(0, 100%, 40%);">- T[t].cb = cb_T3195;</span><br><span style="color: hsl(120, 100%, 40%);">+ Tarr[t].cb = cb_T3195;</span><br><span> break;</span><br><span> default:</span><br><span> LOGPSRC(DTBF, LOGL_ERROR, file, line, "%s attempting to set callback for unknown timer %s [%s], cur_fn=%d\n",</span><br><span> tbf_name(this), get_value_string(tbf_timers_names, t), reason, current_fn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&T[t], sec, microsec);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&Tarr[t], sec, microsec);</span><br><span> }</span><br><span> </span><br><span> int gprs_rlcmac_tbf::check_polling(uint32_t fn, uint8_t ts,</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 34e8101..16ccf43 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -370,8 +370,8 @@</span><br><span> LListHead<gprs_rlcmac_tbf> m_list;</span><br><span> LListHead<gprs_rlcmac_tbf> m_ms_list;</span><br><span> bool m_egprs_enabled;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_timer_list T[T_MAX];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t N[N_MAX];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list Tarr[T_MAX];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t Narr[N_MAX];</span><br><span> mutable char m_name_buf[60];</span><br><span> };</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15424">change 15424</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/+/15424"/><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: Ic2b5068a4882e4a043bf81496be30a378fdb9a09 </div>
<div style="display:none"> Gerrit-Change-Number: 15424 </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: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>