<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19775">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: allocate the bitvec on stack in create_{dl,ul}_ass()<br><br>Initialize the bit vector to use already allocated memory,<br>so we would not need to allocate additional 23 bytes and<br>copy them from the bit vector to a msgb.<br><br>Change-Id: I4190707d7fa5b1c4c3db745635f88d5afb9e21ca<br>---<br>M src/tbf.cpp<br>1 file changed, 19 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index b3436d8..c1ec729 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -1192,7 +1192,6 @@</span><br><span> struct msgb *msg;</span><br><span> struct gprs_rlcmac_dl_tbf *new_dl_tbf = NULL;</span><br><span> RlcMacDownlink_t *mac_control_block = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec *ass_vec = NULL;</span><br><span> int poll_ass_dl = 1;</span><br><span> unsigned int rrbp = 0;</span><br><span> uint32_t new_poll_fn = 0;</span><br><span>@@ -1256,10 +1255,14 @@</span><br><span> msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_dl_ass");</span><br><span> if (!msg)</span><br><span> return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ass_vec = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ass_vec)</span><br><span style="color: hsl(0, 100%, 40%);">- goto free_ret;</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(ass_vec, DUMMY_VEC);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize a bit vector that uses allocated msgb as the data buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Old G++ does not support non-trivial designated initializers. Sigh. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bitvec bv = { };</span><br><span style="color: hsl(120, 100%, 40%);">+ bv.data = msgb_put(msg, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ bv.data_len = GSM_MACBLOCK_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(&bv, DUMMY_VEC);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGPTBF(new_dl_tbf, LOGL_INFO, "start Packet Downlink Assignment (PACCH)\n");</span><br><span> mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);</span><br><span> Encoding::write_packet_downlink_assignment(mac_control_block,</span><br><span>@@ -1268,14 +1271,13 @@</span><br><span> bts_data()->alpha, bts_data()->gamma, -1, 0,</span><br><span> is_egprs_enabled());</span><br><span> LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = encode_gsm_rlcmac_downlink(ass_vec, mac_control_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DTBF, LOGL_ERROR, "Decoding of Packet Downlink Ass failed (%d)\n", rc);</span><br><span> goto free_ret;</span><br><span> }</span><br><span> LOGP(DTBF, LOGL_DEBUG, "------------------------- TX : Packet Downlink Assignment -------------------------\n");</span><br><span> bts->do_rate_ctr_inc(CTR_PKT_DL_ASSIGNMENT);</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_pack(ass_vec, msgb_put(msg, GSM_MACBLOCK_LEN));</span><br><span> </span><br><span> if (poll_ass_dl) {</span><br><span> set_polling(new_poll_fn, ts, GPRS_RLCMAC_POLL_DL_ASS);</span><br><span>@@ -1288,13 +1290,10 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_free(ass_vec);</span><br><span> talloc_free(mac_control_block);</span><br><span> return msg;</span><br><span> </span><br><span> free_ret:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ass_vec != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_free(ass_vec);</span><br><span> talloc_free(mac_control_block);</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span>@@ -1333,7 +1332,6 @@</span><br><span> struct msgb *msg = NULL;</span><br><span> struct gprs_rlcmac_ul_tbf *new_tbf = NULL;</span><br><span> RlcMacDownlink_t *mac_control_block = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec *ass_vec = NULL;</span><br><span> int rc;</span><br><span> unsigned int rrbp;</span><br><span> uint32_t new_poll_fn;</span><br><span>@@ -1361,20 +1359,23 @@</span><br><span> msg = msgb_alloc(GSM_MACBLOCK_LEN, "rlcmac_ul_ass");</span><br><span> if (!msg)</span><br><span> return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize a bit vector that uses allocated msgb as the data buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Old G++ does not support non-trivial designated initializers. Sigh. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bitvec bv = { };</span><br><span style="color: hsl(120, 100%, 40%);">+ bv.data = msgb_put(msg, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ bv.data_len = GSM_MACBLOCK_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_unhex(&bv, DUMMY_VEC);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGPTBF(new_tbf, LOGL_INFO, "start Packet Uplink Assignment (PACCH)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ass_vec = bitvec_alloc(GSM_MACBLOCK_LEN, tall_pcu_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ass_vec)</span><br><span style="color: hsl(0, 100%, 40%);">- goto free_ret;</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_unhex(ass_vec, DUMMY_VEC);</span><br><span style="color: hsl(0, 100%, 40%);">- Encoding::write_packet_uplink_assignment(ass_vec, m_tfi,</span><br><span style="color: hsl(120, 100%, 40%);">+ Encoding::write_packet_uplink_assignment(&bv, m_tfi,</span><br><span> (direction == GPRS_RLCMAC_DL_TBF), tlli(),</span><br><span> is_tlli_valid(), new_tbf, 1, rrbp, bts_data()->alpha,</span><br><span> bts_data()->gamma, -1, is_egprs_enabled());</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_pack(ass_vec, msgb_put(msg, GSM_MACBLOCK_LEN));</span><br><span> </span><br><span> mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);</span><br><span> LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = decode_gsm_rlcmac_downlink(ass_vec, mac_control_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = decode_gsm_rlcmac_downlink(&bv, mac_control_block);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DTBF, LOGL_ERROR, "Decoding of Packet Uplink Ass failed (%d)\n", rc);</span><br><span> goto free_ret;</span><br><span>@@ -1384,13 +1385,10 @@</span><br><span> </span><br><span> set_polling(new_poll_fn, ts, GPRS_RLCMAC_POLL_UL_ASS);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_free(ass_vec);</span><br><span> talloc_free(mac_control_block);</span><br><span> return msg;</span><br><span> </span><br><span> free_ret:</span><br><span style="color: hsl(0, 100%, 40%);">- if (ass_vec != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_free(ass_vec);</span><br><span> talloc_free(mac_control_block);</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19775">change 19775</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/+/19775"/><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: I4190707d7fa5b1c4c3db745635f88d5afb9e21ca </div>
<div style="display:none"> Gerrit-Change-Number: 19775 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>