<p>iedemam has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22712">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: shorten deref chains where possible<br><br>Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb<br>---<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/osmo_bsc_filter.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>M src/osmo-bsc/timeslot_fsm.c<br>5 files changed, 40 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/22712/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 9e00fe7..f45b507 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -973,6 +973,7 @@</span><br><span> {</span><br><span> struct abis_rsl_dchan_hdr *dh = msgb_l2(msg);</span><br><span> struct gsm_lchan *lchan = msg->lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *bts_ctrs = lchan->ts->trx->bts->bts_ctrs;</span><br><span> struct tlv_parsed tp;</span><br><span> const uint8_t *cause_p;</span><br><span> </span><br><span>@@ -981,14 +982,14 @@</span><br><span> </span><br><span> LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]);</span><br><span> switch (lchan->type) {</span><br><span> case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_SDCCH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_SDCCH]);</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_H:</span><br><span> case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_TCH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_TCH]);</span><br><span> break;</span><br><span> default:</span><br><span> break;</span><br><span>@@ -1914,6 +1915,7 @@</span><br><span> {</span><br><span> struct e1inp_sign_link *sign_link = msg->dst;</span><br><span> struct abis_rsl_dchan_hdr *rslh = msgb_l2(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *bts_ctrs = sign_link->trx->bts->bts_ctrs;</span><br><span> int rc = 0;</span><br><span> </span><br><span> msg->lchan = lchan_lookup(sign_link->trx, rslh->chan_nr,</span><br><span>@@ -1931,7 +1933,7 @@</span><br><span> case RSL_MT_DELETE_IND:</span><br><span> /* CCCH overloaded, IMM_ASSIGN was dropped */</span><br><span> LOGPLCHAN(msg->lchan, DRSL, LOGL_NOTICE, "DELETE INDICATION (Downlink CCCH overload)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&sign_link->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_DELETE_IND]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_DELETE_IND]);</span><br><span> break;</span><br><span> case RSL_MT_CBCH_LOAD_IND:</span><br><span> /* current load on the CBCH */</span><br><span>@@ -1943,7 +1945,7 @@</span><br><span> default:</span><br><span> LOGP(DRSL, LOGL_NOTICE, "Unknown Abis RSL TRX message type "</span><br><span> "0x%02x\n", rslh->c.msg_type);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&sign_link->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_UNKNOWN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_UNKNOWN]);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 5054096..5790b3f 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -1231,6 +1231,7 @@</span><br><span> static void lchan_fsm_borken_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> enum bts_counter_id ctr;</span><br><span> switch (prev_state) {</span><br><span> case LCHAN_ST_UNUSED:</span><br><span>@@ -1254,9 +1255,9 @@</span><br><span> default:</span><br><span> ctr = BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[ctr]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[ctr]);</span><br><span> if (prev_state != LCHAN_ST_BORKEN)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stat_item_inc(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_inc(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span> </span><br><span> /* The actual action besides all the beancounting above */</span><br><span> lchan_reset(lchan);</span><br><span>@@ -1265,12 +1266,13 @@</span><br><span> static void lchan_fsm_borken(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> switch (event) {</span><br><span> </span><br><span> case LCHAN_EV_RSL_CHAN_ACTIV_ACK:</span><br><span> /* A late Chan Activ ACK? Release. */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK]);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span> lchan->release.in_error = true;</span><br><span> lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING;</span><br><span> lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause);</span><br><span>@@ -1279,15 +1281,15 @@</span><br><span> </span><br><span> case LCHAN_EV_RSL_CHAN_ACTIV_NACK:</span><br><span> /* A late Chan Activ NACK? Ok then, unused. */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK]);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span> lchan_fsm_state_chg(LCHAN_ST_UNUSED);</span><br><span> return;</span><br><span> </span><br><span> case LCHAN_EV_RSL_RF_CHAN_REL_ACK:</span><br><span> /* A late Release ACK? */</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK]);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1);</span><br><span> lchan->release.in_error = true;</span><br><span> lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING;</span><br><span> lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause);</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>index 0187a75..19cdeee 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_filter.c</span><br><span>@@ -120,18 +120,19 @@</span><br><span> }</span><br><span> </span><br><span> if (conn && conn->lchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs;</span><br><span> switch (mtype) {</span><br><span> case GSM48_MT_MM_LOC_UPD_ACCEPT:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_ACCEPT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_ACCEPT]);</span><br><span> break;</span><br><span> case GSM48_MT_MM_LOC_UPD_REJECT:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_REJECT]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_REJECT]);</span><br><span> break;</span><br><span> case GSM48_MT_MM_IMSI_DETACH_IND:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_DETACH]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_DETACH]);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_UNKNOWN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_UNKNOWN]);</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index d751fc1..49c4ef1 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -381,6 +381,7 @@</span><br><span> {</span><br><span> struct input_signal_data *isd = signal_data;</span><br><span> struct gsm_bts_trx *trx = isd->trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = trx->bts;</span><br><span> </span><br><span> if (subsys != SS_L_INPUT)</span><br><span> return -EINVAL;</span><br><span>@@ -396,9 +397,9 @@</span><br><span> uint8_t ca[20];</span><br><span> /* has to be called before generate_ma_for_ts to</span><br><span> set bts->si_common.cell_alloc */</span><br><span style="color: hsl(0, 100%, 40%);">- generate_cell_chan_list(ca, trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ generate_cell_chan_list(ca, bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(cur_trx, &trx->bts->trx_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(cur_trx, &bts->trx_list, list) {</span><br><span> int i;</span><br><span> for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++)</span><br><span> generate_ma_for_ts(&cur_trx->ts[i]);</span><br><span>@@ -411,19 +412,19 @@</span><br><span> LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type));</span><br><span> </span><br><span> if (isd->link_type == E1INP_SIGN_OML) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_OML_FAIL]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_BTS_OML_FAIL]);</span><br><span> all_ts_dispatch_event(trx, TS_EV_OML_DOWN);</span><br><span> } else if (isd->link_type == E1INP_SIGN_RSL) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_RSL_FAIL]);</span><br><span style="color: hsl(0, 100%, 40%);">- acc_ramp_abort(&trx->bts->acc_ramp);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_BTS_RSL_FAIL]);</span><br><span style="color: hsl(120, 100%, 40%);">+ acc_ramp_abort(&bts->acc_ramp);</span><br><span> all_ts_dispatch_event(trx, TS_EV_RSL_DOWN);</span><br><span> if (trx->nr == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_del(&trx->bts->cbch_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&bts->cbch_timer);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm_bts_sm_mo_reset(trx->bts->site_mgr);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_bts_sm_mo_reset(bts->site_mgr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- abis_nm_clear_queue(trx->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ abis_nm_clear_queue(bts);</span><br><span> break;</span><br><span> default:</span><br><span> break;</span><br><span>diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c</span><br><span>index d8636a1..3fd9d69 100644</span><br><span>--- a/src/osmo-bsc/timeslot_fsm.c</span><br><span>+++ b/src/osmo-bsc/timeslot_fsm.c</span><br><span>@@ -366,6 +366,7 @@</span><br><span> static void ts_fsm_wait_pdch_act(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *bts_ctrs = ts->trx->bts->bts_ctrs;</span><br><span> switch (event) {</span><br><span> </span><br><span> case TS_EV_PDCH_ACT_ACK:</span><br><span>@@ -374,9 +375,9 @@</span><br><span> </span><br><span> case TS_EV_PDCH_ACT_NACK:</span><br><span> if (ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH)</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_IPA_NACK]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_IPA_NACK]);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_NACK]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_ACT_NACK]);</span><br><span> ts->pdch_act_allowed = false;</span><br><span> ts_fsm_error(fi, TS_ST_UNUSED, "Received PDCH activation NACK");</span><br><span> return;</span><br><span>@@ -659,6 +660,7 @@</span><br><span> static void ts_fsm_borken_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span> {</span><br><span> struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = ts->trx->bts;</span><br><span> enum bts_counter_id ctr;</span><br><span> switch (prev_state) {</span><br><span> case TS_ST_NOT_INITIALIZED:</span><br><span>@@ -685,8 +687,8 @@</span><br><span> default:</span><br><span> ctr = BTS_CTR_TS_BORKEN_FROM_UNKNOWN;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[ctr]);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stat_item_inc(ts->trx->bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[ctr]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_inc(bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1);</span><br><span> }</span><br><span> </span><br><span> static void ts_fsm_borken(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -783,9 +785,10 @@</span><br><span> static void ts_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause)</span><br><span> {</span><br><span> struct gsm_bts_trx_ts *ts = ts_fi_ts(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = ts->trx->bts;</span><br><span> if (ts->fi->state == TS_ST_BORKEN) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_TS_BORKEN_EV_TEARDOWN]);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stat_item_dec(ts->trx->bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_TS_BORKEN_EV_TEARDOWN]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/22712">change 22712</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-bsc/+/22712"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb </div>
<div style="display:none"> Gerrit-Change-Number: 22712 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: iedemam <michael@kapsulate.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>