<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20252">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: Fix indentation of for loops<br><br>Change-Id: Id7087bd00d9003235688ff34f2b039d525caa777<br>---<br>M src/gprs_rlcmac_ts_alloc.cpp<br>1 file changed, 48 insertions(+), 48 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>index c4fbbad..836dab5 100644</span><br><span>--- a/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>+++ b/src/gprs_rlcmac_ts_alloc.cpp</span><br><span>@@ -562,70 +562,70 @@</span><br><span> </span><br><span> mslot_fill_rx_mask(mslot_class, num_tx, rx_mask);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Rotate group of TX slots: UUU-----, -UUU----, ..., UU-----U */</span><br><span style="color: hsl(0, 100%, 40%);">- for (ul_ts = 0; ul_ts < 8; ul_ts += 1, tx_valid_win <<= 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t rx_valid_win;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t checked_rx[256/32] = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rotate group of TX slots: UUU-----, -UUU----, ..., UU-----U */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (ul_ts = 0; ul_ts < 8; ul_ts += 1, tx_valid_win <<= 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t rx_valid_win;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t checked_rx[256/32] = {0};</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Wrap valid window */</span><br><span style="color: hsl(0, 100%, 40%);">- tx_valid_win = mslot_wrap_window(tx_valid_win);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wrap valid window */</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_valid_win = mslot_wrap_window(tx_valid_win);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tx_window = tx_valid_win;</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_window = tx_valid_win;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Filter out unavailable slots */</span><br><span style="color: hsl(0, 100%, 40%);">- tx_window &= *ul_slots;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Filter out unavailable slots */</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_window &= *ul_slots;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Skip if the the first TS (ul_ts) is not in the set */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((tx_window & (1 << ul_ts)) == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Skip if the the first TS (ul_ts) is not in the set */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((tx_window & (1 << ul_ts)) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Skip if the the last TS (ul_ts+num_tx-1) is not in the set */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Skip if the the last TS (ul_ts+num_tx-1) is not in the set */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rx_valid_win = (1 << OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx)) - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_valid_win = (1 << OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx)) - 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */</span><br><span style="color: hsl(0, 100%, 40%);">- for (dl_ts = 0; dl_ts < 8; dl_ts += 1, rx_valid_win <<= 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Wrap valid window */</span><br><span style="color: hsl(0, 100%, 40%);">- rx_valid_win = (rx_valid_win | rx_valid_win >> 8) & 0xff;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (dl_ts = 0; dl_ts < 8; dl_ts += 1, rx_valid_win <<= 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wrap valid window */</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_valid_win = (rx_valid_win | rx_valid_win >> 8) & 0xff;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Validate with both Tta/Ttb/Trb and Ttb/Tra/Trb */</span><br><span style="color: hsl(0, 100%, 40%);">- for (mask_sel = MASK_TT; mask_sel <= MASK_TR; mask_sel += 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- int capacity;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Validate with both Tta/Ttb/Trb and Ttb/Tra/Trb */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (mask_sel = MASK_TT; mask_sel <= MASK_TR; mask_sel += 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int capacity;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rx_window = mslot_filter_bad(rx_mask[mask_sel], ul_ts, *dl_slots, rx_valid_win);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rx_window < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_window = mslot_filter_bad(rx_mask[mask_sel], ul_ts, *dl_slots, rx_valid_win);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rx_window < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (skip_slot(mslot_class, mask_sel != MASK_TT, rx_window, tx_window, checked_rx))</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (skip_slot(mslot_class, mask_sel != MASK_TT, rx_window, tx_window, checked_rx))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Compute capacity */</span><br><span style="color: hsl(0, 100%, 40%);">- capacity = compute_capacity(trx, rx_window, tx_window);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Compute capacity */</span><br><span style="color: hsl(120, 100%, 40%);">+ capacity = compute_capacity(trx, rx_window, tx_window);</span><br><span> </span><br><span> #ifdef ENABLE_TS_ALLOC_DEBUG</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRLCMAC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "- Considering DL/UL slots: (TS=0)\"%s\"(TS=7), "</span><br><span style="color: hsl(0, 100%, 40%);">- "capacity = %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- set_flag_chars(set_flag_chars(set_flag_chars(set_flag_chars(</span><br><span style="color: hsl(0, 100%, 40%);">- slot_info,</span><br><span style="color: hsl(0, 100%, 40%);">- rx_bad, 'x', '.'),</span><br><span style="color: hsl(0, 100%, 40%);">- rx_window, 'D'),</span><br><span style="color: hsl(0, 100%, 40%);">- tx_window, 'U'),</span><br><span style="color: hsl(0, 100%, 40%);">- rx_window & tx_window, 'C'),</span><br><span style="color: hsl(0, 100%, 40%);">- capacity);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRLCMAC, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "- Considering DL/UL slots: (TS=0)\"%s\"(TS=7), "</span><br><span style="color: hsl(120, 100%, 40%);">+ "capacity = %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ set_flag_chars(set_flag_chars(set_flag_chars(set_flag_chars(</span><br><span style="color: hsl(120, 100%, 40%);">+ slot_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_bad, 'x', '.'),</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_window, 'D'),</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_window, 'U'),</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_window & tx_window, 'C'),</span><br><span style="color: hsl(120, 100%, 40%);">+ capacity);</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (capacity <= max_capacity)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (capacity <= max_capacity)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- max_capacity = capacity;</span><br><span style="color: hsl(0, 100%, 40%);">- max_ul_slots = tx_window;</span><br><span style="color: hsl(0, 100%, 40%);">- max_dl_slots = rx_window;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ max_capacity = capacity;</span><br><span style="color: hsl(120, 100%, 40%);">+ max_ul_slots = tx_window;</span><br><span style="color: hsl(120, 100%, 40%);">+ max_dl_slots = rx_window;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> if (!max_ul_slots || !max_dl_slots) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/20252">change 20252</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/+/20252"/><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: Id7087bd00d9003235688ff34f2b039d525caa777 </div>
<div style="display:none"> Gerrit-Change-Number: 20252 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>