<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22185">View Change</a></p><div style="white-space:pre-wrap">Approvals:
lynxis lazus: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move cs_downgrade_threshold field from BTS to PCU<br><br>Change-Id: I3e1c65eb3cccff565d5d84588bdce93a47909a0f<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_ms.c<br>M src/gprs_pcu.c<br>M src/gprs_pcu.h<br>M src/pcu_vty.c<br>M tests/ms/MsTest.cpp<br>M tests/tbf/TbfTest.cpp<br>8 files changed, 14 insertions(+), 25 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 3795ca2..32ec71e 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -232,7 +232,6 @@</span><br><span> bts->mcs_lqual_ranges[7].high = 24;</span><br><span> bts->mcs_lqual_ranges[8].low = 23;</span><br><span> bts->mcs_lqual_ranges[8].high = 256;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = 200;</span><br><span> bts->ns_dialect = NS2_DIALECT_IPACCESS;</span><br><span> </span><br><span> /* TODO: increase them when CRBB decoding is implemented */</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index ea218f7..afad02c 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -108,10 +108,6 @@</span><br><span> </span><br><span> uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span> bool si13_is_set;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* downgrade DL CS when less than specified octets are left in tx queue. Optimization, see paper:</span><br><span style="color: hsl(0, 100%, 40%);">- "Theoretical Analysis of GPRS Throughput and Delay" */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t cs_downgrade_threshold;</span><br><span> /* Link quality range for each UL (M)CS. Below or above, next/prev (M)CS is selected. */</span><br><span> struct {int16_t low; int16_t high; } cs_lqual_ranges[MAX_GPRS_CS];</span><br><span> struct {int16_t low; int16_t high; } mcs_lqual_ranges[MAX_EDGE_MCS];</span><br><span>diff --git a/src/gprs_ms.c b/src/gprs_ms.c</span><br><span>index cc64c86..c0fb55e 100644</span><br><span>--- a/src/gprs_ms.c</span><br><span>+++ b/src/gprs_ms.c</span><br><span>@@ -794,7 +794,7 @@</span><br><span> unencoded_octets += llc_chunk_size(tbf_llc((struct gprs_rlcmac_tbf *)ms->dl_tbf));</span><br><span> </span><br><span> /* There are many unencoded octets, don't reduce */</span><br><span style="color: hsl(0, 100%, 40%);">- if (unencoded_octets >= bts_data(ms->bts)->cs_downgrade_threshold)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (unencoded_octets >= the_pcu->vty.cs_downgrade_threshold)</span><br><span> return cs;</span><br><span> </span><br><span> /* RF conditions are good, don't reduce */</span><br><span>diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c</span><br><span>index d7a851b..ba48c38 100644</span><br><span>--- a/src/gprs_pcu.c</span><br><span>+++ b/src/gprs_pcu.c</span><br><span>@@ -58,6 +58,7 @@</span><br><span> pcu->vty.cs_adj_enabled = true;</span><br><span> pcu->vty.cs_adj_upper_limit = 33; /* Decrease CS if the error rate is above */</span><br><span> pcu->vty.cs_adj_lower_limit = 10; /* Increase CS if the error rate is below */</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu->vty.cs_downgrade_threshold = 200;</span><br><span> </span><br><span> pcu->T_defs = T_defs_pcu;</span><br><span> osmo_tdefs_reset(pcu->T_defs);</span><br><span>diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h</span><br><span>index 6c9eae1..146b8b8 100644</span><br><span>--- a/src/gprs_pcu.h</span><br><span>+++ b/src/gprs_pcu.h</span><br><span>@@ -82,6 +82,9 @@</span><br><span> bool cs_adj_enabled; /* whether cs_adj_{upper,lower}_limit are used to adjust DL CS */</span><br><span> uint8_t cs_adj_upper_limit; /* downgrade DL CS if error rate above its value */</span><br><span> uint8_t cs_adj_lower_limit; /* upgrade DL CS if error rate below its value */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* downgrade DL CS when less than specified octets are left in tx queue. Optimization, see paper:</span><br><span style="color: hsl(120, 100%, 40%);">+ "Theoretical Analysis of GPRS Throughput and Delay" */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t cs_downgrade_threshold;</span><br><span> } vty;</span><br><span> </span><br><span> struct gsmtap_inst *gsmtap;</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index c830400..e0edf91 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -143,9 +143,9 @@</span><br><span> else</span><br><span> vty_out(vty, " no cs threshold%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->cs_downgrade_threshold)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (the_pcu->vty.cs_downgrade_threshold)</span><br><span> vty_out(vty, " cs downgrade-threshold %d%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold, VTY_NEWLINE);</span><br><span> else</span><br><span> vty_out(vty, " no cs downgrade-threshold%s", VTY_NEWLINE);</span><br><span> </span><br><span>@@ -947,10 +947,7 @@</span><br><span> CS_STR CS_DOWNGRADE_STR "downgrade if less octets left\n",</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -960,10 +957,7 @@</span><br><span> NO_STR CS_STR CS_DOWNGRADE_STR,</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp</span><br><span>index b914f01..d6c8f18 100644</span><br><span>--- a/tests/ms/MsTest.cpp</span><br><span>+++ b/tests/ms/MsTest.cpp</span><br><span>@@ -510,7 +510,7 @@</span><br><span> </span><br><span> bts->initial_cs_dl = 4;</span><br><span> bts->initial_cs_ul = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold = 0;</span><br><span> the_pcu->vty.cs_adj_lower_limit = 0;</span><br><span> </span><br><span> ms = ms_alloc(&the_bts, tlli);</span><br><span>@@ -525,7 +525,7 @@</span><br><span> </span><br><span> OSMO_ASSERT(mcs_chan_code(ms_current_cs_dl(ms)) == 3);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = 200;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold = 200;</span><br><span> </span><br><span> OSMO_ASSERT(mcs_chan_code(ms_current_cs_dl(ms)) == 2);</span><br><span> </span><br><span>@@ -559,7 +559,7 @@</span><br><span> </span><br><span> bts->initial_cs_dl = 4;</span><br><span> bts->initial_cs_ul = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold = 0;</span><br><span> </span><br><span> ms2 = ms_alloc(&the_bts, tlli + 1);</span><br><span> dump_ms(ms2, "2: with BTS defaults");</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 52403e1..75b51bf 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -3070,13 +3070,11 @@</span><br><span> {</span><br><span> the_pcu->bts = bts_alloc(the_pcu);</span><br><span> BTS *the_bts = the_pcu->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_rlcmac_bts *bts;</span><br><span> uint8_t ts_no = 4;</span><br><span> </span><br><span> fprintf(stderr, "=== start %s ===\n", __func__);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts = the_bts->bts_data();</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold = 0;</span><br><span> setup_bts(the_bts, ts_no);</span><br><span> OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2031, 200, OSMO_TDEF_MS) == 0);</span><br><span> /* ARQ II */</span><br><span>@@ -3100,13 +3098,11 @@</span><br><span> {</span><br><span> the_pcu->bts = bts_alloc(the_pcu);</span><br><span> BTS *the_bts = the_pcu->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_rlcmac_bts *bts;</span><br><span> uint8_t ts_no = 4;</span><br><span> </span><br><span> fprintf(stderr, "=== start %s ===\n", __func__);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts = the_bts->bts_data();</span><br><span style="color: hsl(0, 100%, 40%);">- bts->cs_downgrade_threshold = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.cs_downgrade_threshold = 0;</span><br><span> setup_bts(the_bts, ts_no);</span><br><span> OSMO_ASSERT(osmo_tdef_set(the_pcu->T_defs, -2031, 200, OSMO_TDEF_MS) == 0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22185">change 22185</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/+/22185"/><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: I3e1c65eb3cccff565d5d84588bdce93a47909a0f </div>
<div style="display:none"> Gerrit-Change-Number: 22185 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>