<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26074">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Introduce new RACH req counters for one/two phase access<br><br>These new counters allow the user to find out which kind of access are<br>MS requesting.<br><br>Related: SYS#4878<br>Change-Id: Id87c3a53d3acee92499987c843130e358f54742c<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M tests/tbf/TbfTest.err<br>3 files changed, 23 insertions(+), 4 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 4ce036b..7974f41 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -137,6 +137,8 @@</span><br><span> { "pch:requests:timeout", "PCH requests timeout "},</span><br><span> { "rach:requests", "RACH requests received"},</span><br><span> { "rach:requests:11bit", "11BIT_RACH requests received"},</span><br><span style="color: hsl(120, 100%, 40%);">+ { "rach:requests:one_phase", "One phase packet access with request for single TS UL"}, /* TS 52.402 B.2.1.49 */</span><br><span style="color: hsl(120, 100%, 40%);">+ { "rach:requests:two_phase", "Single block packet request for two phase packet access"}, /* TS 52.402 B.2.1.49 */</span><br><span> { "spb:uplink_first_segment", "First seg of UL SPB "},</span><br><span> { "spb:uplink_second_segment", "Second seg of UL SPB "},</span><br><span> { "spb:downlink_first_segment", "First seg of DL SPB "},</span><br><span>@@ -897,12 +899,17 @@</span><br><span> if (rc) /* Send RR Immediate Assignment Reject */</span><br><span> goto send_imm_ass_rej;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (chan_req.single_block)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chan_req.single_block) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_do_rate_ctr_inc(bts, CTR_RACH_REQUESTS_TWO_PHASE);</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block allocation\n");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (bts->pcu->vty.force_two_phase) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_do_rate_ctr_inc(bts, CTR_RACH_REQUESTS_ONE_PHASE);</span><br><span> LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single TS uplink transmission "</span><br><span style="color: hsl(0, 100%, 40%);">- "(one phase packet access), but we force two phase access\n");</span><br><span style="color: hsl(0, 100%, 40%);">- chan_req.single_block = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ "(one phase packet access)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->pcu->vty.force_two_phase) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_DEBUG, "Forcing two phase access\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_req.single_block = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* TODO: handle Radio Priority (see 3GPP TS 44.060, table 11.2.5a.5) */</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 63f80a8..06eb07c 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -129,6 +129,8 @@</span><br><span> CTR_PCH_REQUESTS_TIMEDOUT,</span><br><span> CTR_RACH_REQUESTS,</span><br><span> CTR_RACH_REQUESTS_11BIT,</span><br><span style="color: hsl(120, 100%, 40%);">+ CTR_RACH_REQUESTS_ONE_PHASE,</span><br><span style="color: hsl(120, 100%, 40%);">+ CTR_RACH_REQUESTS_TWO_PHASE,</span><br><span> CTR_SPB_UL_FIRST_SEGMENT,</span><br><span> CTR_SPB_UL_SECOND_SEGMENT,</span><br><span> CTR_SPB_DL_FIRST_SEGMENT,</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 26ba446..27be4f0 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -1719,6 +1719,7 @@</span><br><span> === start test_tbf_single_phase ===</span><br><span> Found first unallocated TRX=0 TFI=0</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x03 (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -2445,6 +2446,7 @@</span><br><span> DL_ASS_TBF(UL-TFI_0){SEND_ASS}: Deallocated</span><br><span> Found first unallocated TRX=0 TFI=0</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x03 (8 bit) Fn=2654275 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7104,6 +7106,7 @@</span><br><span> === end test_tbf_epdan_out_of_rx_window ===</span><br><span> === start test_immediate_assign_rej_multi_block ===</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x78 (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7131,6 +7134,7 @@</span><br><span> Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7</span><br><span> Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=0 USF=0</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x79 (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7158,6 +7162,7 @@</span><br><span> Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7</span><br><span> Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=1 USF=1</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x7a (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7185,6 +7190,7 @@</span><br><span> Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7</span><br><span> Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=2 USF=2</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x7b (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7212,6 +7218,7 @@</span><br><span> Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7</span><br><span> Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=3 USF=3</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x7c (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7239,6 +7246,7 @@</span><br><span> Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7</span><br><span> Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=4 USF=4</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x7d (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7266,6 +7274,7 @@</span><br><span> Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7</span><br><span> Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=5 USF=5</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x7e (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span>@@ -7293,6 +7302,7 @@</span><br><span> Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7</span><br><span> Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=6 USF=6</span><br><span> MS requests Uplink resource on CCCH/RACH: ra=0x7f (8 bit) Fn=2654167 qta=31</span><br><span style="color: hsl(120, 100%, 40%);">+MS requests single TS uplink transmission (one phase packet access)</span><br><span> Creating MS object, TLLI = 0xffffffff</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here **********</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26074">change 26074</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/+/26074"/><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: Id87c3a53d3acee92499987c843130e358f54742c </div>
<div style="display:none"> Gerrit-Change-Number: 26074 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>