<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25400">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add stats: pcu.bts.N.pdch.occupied.gprs/egprs<br><br>Add stats needed for performance measurements in<br>3GPP TS 52.402 § B.2.1.54-55.<br><br>Split m_num_tbfs to count GPRS and EGPRS TBFs separately. Move the code<br>that updates m_num_tbfs and sets the PDCH_OCCUPIED stats to a separate<br>function, as it's mostly the same in the TBF attach and detach.<br><br>Related: SYS#4878<br>Change-Id: I0c0a1121b4ae5f031782e7e63a0c28eb0b6c8b42<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/pdch.cpp<br>M src/pdch.h<br>M src/tbf.h<br>5 files changed, 45 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/25400/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index beb626d..c463606 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -201,7 +201,11 @@</span><br><span> OSMO_STAT_ITEM_NO_UNIT, 4, 0},</span><br><span> { "pdch.available", "PDCH available ",</span><br><span> OSMO_STAT_ITEM_NO_UNIT, 50, 0},</span><br><span style="color: hsl(0, 100%, 40%);">- { "pdch.occupied", "PDCH occupied ",</span><br><span style="color: hsl(120, 100%, 40%);">+ { "pdch.occupied", "PDCH occupied (all) ",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STAT_ITEM_NO_UNIT, 50, 0},</span><br><span style="color: hsl(120, 100%, 40%);">+ { "pdch.occupied.gprs", "PDCH occupied (GPRS) ",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STAT_ITEM_NO_UNIT, 50, 0},</span><br><span style="color: hsl(120, 100%, 40%);">+ { "pdch.occupied.egprs","PDCH occupied (EGPRS)",</span><br><span> OSMO_STAT_ITEM_NO_UNIT, 50, 0},</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index a6e7150..d9a86eb 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -184,6 +184,8 @@</span><br><span> STAT_MS_PRESENT,</span><br><span> STAT_PDCH_AVAILABLE,</span><br><span> STAT_PDCH_OCCUPIED,</span><br><span style="color: hsl(120, 100%, 40%);">+ STAT_PDCH_OCCUPIED_GPRS,</span><br><span style="color: hsl(120, 100%, 40%);">+ STAT_PDCH_OCCUPIED_EGPRS,</span><br><span> };</span><br><span> </span><br><span> /* RACH.ind parameters (to be parsed) */</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index e213c28..8b40d7a 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -1036,6 +1036,31 @@</span><br><span> return tbf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void gprs_rlcmac_pdch::num_tbfs_update(gprs_rlcmac_tbf *tbf, bool is_attach)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ enum tbf_type type = tbf->is_egprs_enabled() ? TBF_TYPE_EGPRS : TBF_TYPE_GPRS;</span><br><span style="color: hsl(120, 100%, 40%);">+ int threshold = is_attach ? 0 : 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int inc = is_attach ? 1 : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ul_dl_gprs = m_num_tbfs[GPRS_RLCMAC_UL_TBF][TBF_TYPE_GPRS] +</span><br><span style="color: hsl(120, 100%, 40%);">+ m_num_tbfs[GPRS_RLCMAC_DL_TBF][TBF_TYPE_GPRS];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ul_dl_egprs = m_num_tbfs[GPRS_RLCMAC_UL_TBF][TBF_TYPE_EGPRS] +</span><br><span style="color: hsl(120, 100%, 40%);">+ m_num_tbfs[GPRS_RLCMAC_DL_TBF][TBF_TYPE_EGPRS];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Count PDCHs with at least one TBF as "occupied", as in</span><br><span style="color: hsl(120, 100%, 40%);">+ * 3GPP TS 52.402 § B.2.1.42-44. So if transitioning from 0 (threshold)</span><br><span style="color: hsl(120, 100%, 40%);">+ * TBFs in this PDCH to 1, increase the counter by 1 (inc). */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ul_dl_gprs + ul_dl_egprs == threshold)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_stat_item_add(trx->bts, STAT_PDCH_OCCUPIED, inc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Update occupied GPRS/EGPRS stats too (§ B.2.1.54-55) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (type == TBF_TYPE_GPRS && ul_dl_gprs == threshold)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_stat_item_add(trx->bts, STAT_PDCH_OCCUPIED_GPRS, inc);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (type == TBF_TYPE_EGPRS && ul_dl_egprs == threshold)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_stat_item_add(trx->bts, STAT_PDCH_OCCUPIED_EGPRS, inc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ m_num_tbfs[tbf->direction][type] += inc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void gprs_rlcmac_pdch::attach_tbf(gprs_rlcmac_tbf *tbf)</span><br><span> {</span><br><span> gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span>@@ -1045,13 +1070,7 @@</span><br><span> "%s has not been detached, overwriting it\n",</span><br><span> m_tbfs[tbf->direction][tbf->tfi()]->name());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Count PDCHs with at least one TBF as "occupied", as in</span><br><span style="color: hsl(0, 100%, 40%);">- * 3GPP TS 52.402 § B.2.1.42-44. So if transitioning from 0 TBFs in</span><br><span style="color: hsl(0, 100%, 40%);">- * this PDCH to 1, increase the counter by 1. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (m_num_tbfs[GPRS_RLCMAC_UL_TBF] + m_num_tbfs[GPRS_RLCMAC_DL_TBF] == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- bts_stat_item_inc(trx->bts, STAT_PDCH_OCCUPIED);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- m_num_tbfs[tbf->direction] += 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ num_tbfs_update(tbf, 1);</span><br><span> if (tbf->direction == GPRS_RLCMAC_UL_TBF) {</span><br><span> ul_tbf = as_ul_tbf(tbf);</span><br><span> m_assigned_usf |= 1 << ul_tbf->m_usf[ts_no];</span><br><span>@@ -1061,7 +1080,7 @@</span><br><span> </span><br><span> LOGPDCH(this, DRLCMAC, LOGL_INFO, "Attaching %s, %d TBFs, "</span><br><span> "USFs = %02x, TFIs = %08x.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->name(), m_num_tbfs[tbf->direction],</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->name(), num_tbfs(tbf->direction),</span><br><span> m_assigned_usf, m_assigned_tfi[tbf->direction]);</span><br><span> }</span><br><span> </span><br><span>@@ -1071,13 +1090,7 @@</span><br><span> </span><br><span> OSMO_ASSERT(m_num_tbfs[tbf->direction] > 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Count PDCHs with at least one TBF as "occupied", as in</span><br><span style="color: hsl(0, 100%, 40%);">- * 3GPP TS 52.402 § B.2.1.42-44. So if transitioning from 1 TBFs in</span><br><span style="color: hsl(0, 100%, 40%);">- * this PDCH to 0, decrease the counter by 1. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (m_num_tbfs[GPRS_RLCMAC_UL_TBF] + m_num_tbfs[GPRS_RLCMAC_DL_TBF] == 1)</span><br><span style="color: hsl(0, 100%, 40%);">- bts_stat_item_dec(trx->bts, STAT_PDCH_OCCUPIED);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- m_num_tbfs[tbf->direction] -= 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ num_tbfs_update(tbf, 0);</span><br><span> if (tbf->direction == GPRS_RLCMAC_UL_TBF) {</span><br><span> ul_tbf = as_ul_tbf(tbf);</span><br><span> m_assigned_usf &= ~(1 << ul_tbf->m_usf[ts_no]);</span><br><span>@@ -1089,7 +1102,7 @@</span><br><span> </span><br><span> LOGPDCH(this, DRLCMAC, LOGL_INFO, "Detaching %s, %d TBFs, "</span><br><span> "USFs = %02x, TFIs = %08x.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->name(), m_num_tbfs[tbf->direction],</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->name(), num_tbfs(tbf->direction),</span><br><span> m_assigned_usf, m_assigned_tfi[tbf->direction]);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/pdch.h b/src/pdch.h</span><br><span>index 00f0b9d..6243a61 100644</span><br><span>--- a/src/pdch.h</span><br><span>+++ b/src/pdch.h</span><br><span>@@ -145,9 +145,11 @@</span><br><span> enum gprs_rlcmac_tbf_direction dir);</span><br><span> </span><br><span> void free_resources();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ void num_tbfs_update(gprs_rlcmac_tbf *tbf, bool is_attach);</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t m_num_tbfs[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t m_num_tbfs[2][2]; /* by direction (UL/DL), type (GPRS/EGPRS) */</span><br><span> uint8_t m_num_reserved[2];</span><br><span> uint8_t m_assigned_usf; /* bit set */</span><br><span> uint32_t m_assigned_tfi[2]; /* bit set */</span><br><span>@@ -158,7 +160,7 @@</span><br><span> </span><br><span> inline unsigned gprs_rlcmac_pdch::num_tbfs(enum gprs_rlcmac_tbf_direction dir) const</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return m_num_tbfs[dir];</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_num_tbfs[dir][TBF_TYPE_GPRS] + m_num_tbfs[dir][TBF_TYPE_EGPRS];</span><br><span> }</span><br><span> </span><br><span> inline unsigned gprs_rlcmac_pdch::num_reserved(</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 0932933..ebe1d95 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -86,6 +86,11 @@</span><br><span> TBF_CTR_EGPRS_DL_MCS9,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum tbf_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ TBF_TYPE_GPRS,</span><br><span style="color: hsl(120, 100%, 40%);">+ TBF_TYPE_EGPRS,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> extern const struct rate_ctr_group_desc tbf_ctrg_desc;</span><br><span> extern unsigned int next_tbf_ctr_group_id;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25400">change 25400</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/+/25400"/><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: I0c0a1121b4ae5f031782e7e63a0c28eb0b6c8b42 </div>
<div style="display:none"> Gerrit-Change-Number: 25400 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>