<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25333">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add stats: pcu.bts.N.pdch.available/occupied<br><br>Count available PDCHs (3GPP TS 52.402 § B.2.1.38) as well as occupied<br>PDCHs (§ B.2.1.42-44).<br><br>Related: SYS#4878<br>Change-Id: I74760a68ee055510a79e80854ec7bf1521669119<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/pdch.cpp<br>3 files changed, 24 insertions(+), 0 deletions(-)<br><br></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 8ccbee9..beb626d 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -199,6 +199,10 @@</span><br><span> static const struct osmo_stat_item_desc bts_stat_item_description[] = {</span><br><span> { "ms.present", "MS Present ",</span><br><span> OSMO_STAT_ITEM_NO_UNIT, 4, 0},</span><br><span style="color: hsl(120, 100%, 40%);">+ { "pdch.available", "PDCH available ",</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", "PDCH occupied ",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STAT_ITEM_NO_UNIT, 50, 0},</span><br><span> };</span><br><span> </span><br><span> static const struct osmo_stat_item_group_desc bts_statg_desc = {</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 5e45527..a6e7150 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -182,6 +182,8 @@</span><br><span> </span><br><span> enum {</span><br><span> STAT_MS_PRESENT,</span><br><span style="color: hsl(120, 100%, 40%);">+ STAT_PDCH_AVAILABLE,</span><br><span style="color: hsl(120, 100%, 40%);">+ STAT_PDCH_OCCUPIED,</span><br><span> };</span><br><span> </span><br><span> /* RACH.ind parameters (to be parsed) */</span><br><span>@@ -346,6 +348,10 @@</span><br><span> osmo_stat_item_set(item, val + inc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define bts_stat_item_inc(bts, stat_id) bts_stat_item_add(bts, stat_id, 1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define bts_stat_item_dec(bts, stat_id) bts_stat_item_add(bts, stat_id, -1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gprs_rlcmac_bts *bts_alloc(struct gprs_pcu *pcu, uint8_t bts_nr);</span><br><span> </span><br><span> struct gprs_rlcmac_sba *bts_alloc_sba(struct gprs_rlcmac_bts *bts, uint8_t ta);</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 49f9eb6..e213c28 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -150,6 +150,7 @@</span><br><span> this->ulc = pdch_ulc_alloc(this, trx->bts);</span><br><span> </span><br><span> m_is_enabled = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_stat_item_inc(trx->bts, STAT_PDCH_AVAILABLE);</span><br><span> }</span><br><span> </span><br><span> void gprs_rlcmac_pdch::disable()</span><br><span>@@ -158,6 +159,7 @@</span><br><span> this->free_resources();</span><br><span> </span><br><span> m_is_enabled = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_stat_item_dec(trx->bts, STAT_PDCH_AVAILABLE);</span><br><span> }</span><br><span> </span><br><span> void gprs_rlcmac_pdch::free_resources()</span><br><span>@@ -1043,6 +1045,12 @@</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(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 TBFs in</span><br><span style="color: hsl(120, 100%, 40%);">+ * this PDCH to 1, increase the counter by 1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_num_tbfs[GPRS_RLCMAC_UL_TBF] + m_num_tbfs[GPRS_RLCMAC_DL_TBF] == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_stat_item_inc(trx->bts, STAT_PDCH_OCCUPIED);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> m_num_tbfs[tbf->direction] += 1;</span><br><span> if (tbf->direction == GPRS_RLCMAC_UL_TBF) {</span><br><span> ul_tbf = as_ul_tbf(tbf);</span><br><span>@@ -1063,6 +1071,12 @@</span><br><span> </span><br><span> OSMO_ASSERT(m_num_tbfs[tbf->direction] > 0);</span><br><span> </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 1 TBFs in</span><br><span style="color: hsl(120, 100%, 40%);">+ * this PDCH to 0, decrease the counter by 1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (m_num_tbfs[GPRS_RLCMAC_UL_TBF] + m_num_tbfs[GPRS_RLCMAC_DL_TBF] == 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_stat_item_dec(trx->bts, STAT_PDCH_OCCUPIED);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> m_num_tbfs[tbf->direction] -= 1;</span><br><span> if (tbf->direction == GPRS_RLCMAC_UL_TBF) {</span><br><span> ul_tbf = as_ul_tbf(tbf);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25333">change 25333</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/+/25333"/><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: I74760a68ee055510a79e80854ec7bf1521669119 </div>
<div style="display:none"> Gerrit-Change-Number: 25333 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </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>