<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22181">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move alpha,gamma fields from BTS to PCU<br><br>Change-Id: I2fdd9c8a7393157183fff64084bb10e2a3b1dc63<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_pcu.c<br>M src/gprs_pcu.h<br>M src/pcu_vty.c<br>M src/tbf.cpp<br>M tests/emu/pcu_emu.cpp<br>7 files changed, 12 insertions(+), 18 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 f965714..3200b40 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -200,7 +200,6 @@</span><br><span> bts->n3101 = 10;</span><br><span> bts->n3103 = 4;</span><br><span> bts->n3105 = 8;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->alpha = 0; /* a = 0.0 */</span><br><span> bts->si13_is_set = false;</span><br><span> bts->cs_adj_enabled = 1;</span><br><span> bts->cs_adj_upper_limit = 33; /* Decrease CS if the error rate is above */</span><br><span>@@ -966,7 +965,7 @@</span><br><span> plen = Encoding::write_immediate_assignment(</span><br><span> &m_bts.trx[trx_no].pdch[ts_no], tbf, bv,</span><br><span> false, rip->ra, Fn, ta, usf, false, sb_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- m_bts.alpha, m_bts.gamma, -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu->vty.alpha, pcu->vty.gamma, -1,</span><br><span> rip->burst_type);</span><br><span> do_rate_ctr_inc(CTR_IMMEDIATE_ASSIGN_UL_TBF);</span><br><span> }</span><br><span>@@ -1048,7 +1047,7 @@</span><br><span> tbf, immediate_assignment, true, 125,</span><br><span> (tbf->pdch[ts_no]->last_rts_fn + 21216) % GSM_MAX_FN,</span><br><span> tbf->ta(), 7, poll, tbf->poll_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- m_bts.alpha, m_bts.gamma, -1,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu->vty.alpha, pcu->vty.gamma, -1,</span><br><span> GSM_L1_BURST_TYPE_ACCESS_0);</span><br><span> if (plen >= 0) {</span><br><span> do_rate_ctr_inc(CTR_IMMEDIATE_ASSIGN_DL_TBF);</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 2097cca..81f7327 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -106,7 +106,6 @@</span><br><span> uint8_t n3105;</span><br><span> struct gprs_rlcmac_trx trx[8];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t alpha, gamma;</span><br><span> bool dl_tbf_preemptive_retransmission;</span><br><span> uint8_t si13[GSM_MACBLOCK_LEN];</span><br><span> bool si13_is_set;</span><br><span>diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c</span><br><span>index e08094b..f791e43 100644</span><br><span>--- a/src/gprs_pcu.c</span><br><span>+++ b/src/gprs_pcu.c</span><br><span>@@ -50,6 +50,7 @@</span><br><span> pcu->vty.max_cs_dl = MAX_GPRS_CS;</span><br><span> pcu->vty.max_mcs_ul = MAX_EDGE_MCS;</span><br><span> pcu->vty.max_mcs_dl = MAX_EDGE_MCS;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu->vty.alpha = 0; /* a = 0.0 */</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 4920966..d6d2dca 100644</span><br><span>--- a/src/gprs_pcu.h</span><br><span>+++ b/src/gprs_pcu.h</span><br><span>@@ -75,6 +75,7 @@</span><br><span> uint8_t max_cs_dl, max_cs_ul;</span><br><span> uint8_t max_mcs_dl, max_mcs_ul;</span><br><span> uint8_t force_two_phase;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t alpha, gamma;</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 83fb166..06e1674 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -229,8 +229,8 @@</span><br><span> vty_out(vty, " alloc-algorithm dynamic%s", VTY_NEWLINE);</span><br><span> if (the_pcu->vty.force_two_phase)</span><br><span> vty_out(vty, " two-phase-access%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " alpha %d%s", bts->alpha, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " gamma %d%s", bts->gamma * 2, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " alpha %d%s", the_pcu->vty.alpha, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gamma %d%s", the_pcu->vty.gamma * 2, VTY_NEWLINE);</span><br><span> if (!bts->dl_tbf_preemptive_retransmission)</span><br><span> vty_out(vty, " no dl-tbf-preemptive-retransmission%s", VTY_NEWLINE);</span><br><span> if (strcmp(the_pcu->pcu_sock_path, PCU_SOCK_DEFAULT))</span><br><span>@@ -804,10 +804,7 @@</span><br><span> "Alpha in units of 0.1\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->alpha = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.alpha = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -818,10 +815,7 @@</span><br><span> "Gamma in even unit of dBs\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->gamma = atoi(argv[0]) / 2;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.gamma = atoi(argv[0]) / 2;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index c42081b..eb043e5 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -926,7 +926,7 @@</span><br><span> Encoding::write_packet_downlink_assignment(mac_control_block,</span><br><span> old_tfi_is_valid, m_tfi, (direction == GPRS_RLCMAC_DL_TBF),</span><br><span> new_dl_tbf, poll_ass_dl, rrbp,</span><br><span style="color: hsl(0, 100%, 40%);">- bts_data()->alpha, bts_data()->gamma, -1, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.alpha, the_pcu->vty.gamma, -1, 0,</span><br><span> is_egprs_enabled());</span><br><span> LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++\n");</span><br><span> rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block);</span><br><span>@@ -1029,8 +1029,8 @@</span><br><span> mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);</span><br><span> Encoding::write_packet_uplink_assignment(mac_control_block, m_tfi,</span><br><span> (direction == GPRS_RLCMAC_DL_TBF), tlli(),</span><br><span style="color: hsl(0, 100%, 40%);">- is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha,</span><br><span style="color: hsl(0, 100%, 40%);">- bts_data()->gamma, -1, is_egprs_enabled());</span><br><span style="color: hsl(120, 100%, 40%);">+ is_tlli_valid(), new_tbf, 1, rrbp, the_pcu->vty.alpha,</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.gamma, -1, is_egprs_enabled());</span><br><span> </span><br><span> LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n");</span><br><span> rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block);</span><br><span>diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp</span><br><span>index 7534b84..96aacda 100644</span><br><span>--- a/tests/emu/pcu_emu.cpp</span><br><span>+++ b/tests/emu/pcu_emu.cpp</span><br><span>@@ -72,13 +72,13 @@</span><br><span> bts->n3101 = 10;</span><br><span> bts->n3103 = 4;</span><br><span> bts->n3105 = 8;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->alpha = 0; /* a = 0.0 */</span><br><span> }</span><br><span> </span><br><span> static void init_pcu(struct gprs_pcu *pcu)</span><br><span> {</span><br><span> if (!pcu->alloc_algorithm)</span><br><span> pcu->alloc_algorithm = alloc_algorithm_b;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu->vty.alpha = 0; /* a = 0.0 */</span><br><span> }</span><br><span> </span><br><span> static void bvci_unblocked(struct gprs_bssgp_pcu *pcu)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22181">change 22181</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/+/22181"/><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: I2fdd9c8a7393157183fff64084bb10e2a3b1dc63 </div>
<div style="display:none"> Gerrit-Change-Number: 22181 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>