<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12289">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx/loops.c: Use lchan name based logging<br><br>The loops.c code dates back to ancient times when we printed the TRX<br>number and the raw channel number to identify a logical channel. We<br>meanwhile have gsm_lchan_name() and should use it to log messages<br>related to this lchan in a common format.<br><br>This commit introduces the LOGPLCHAN() helper macro [similar to<br>osmo-bsc], and uses it from loops.c.<br><br>As a result, some functions don't need a chan_nr argument anymore,<br>while some need to add a new lchan argument.<br><br>Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718<br>Related: OS#1622, OS#1851<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/osmo-bts-trx/loops.c<br>2 files changed, 38 insertions(+), 56 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/12289/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index 9e62cdf..1de5edd 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -24,6 +24,8 @@</span><br><span> #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41</span><br><span> #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gsm_network {</span><br><span> struct llist_head bts_list;</span><br><span> unsigned int num_bts;</span><br><span>diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c</span><br><span>index cb4a9cc..e9bc560 100644</span><br><span>--- a/src/osmo-bts-trx/loops.c</span><br><span>+++ b/src/osmo-bts-trx/loops.c</span><br><span>@@ -39,9 +39,8 @@</span><br><span> </span><br><span> /*! compute the new MS POWER LEVEL communicated to the MS and store it in lchan.</span><br><span> * \param lchan logical channel for which to compute (and in whihc to store) new power.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] chan_nr RSL channel number of the channel, only used for logging purpose.</span><br><span> * \param[in] diff input delta value (in dB) */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ms_power_diff(struct gsm_lchan *lchan, int8_t diff)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span> enum gsm_band band = trx->bts->band;</span><br><span>@@ -77,20 +76,16 @@</span><br><span> new_power = lchan->ms_power_ctrl.current - MS_RAISE_MAX;</span><br><span> </span><br><span> if (lchan->ms_power_ctrl.current == new_power) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_INFO, "Keeping MS new_power of trx=%u "</span><br><span style="color: hsl(0, 100%, 40%);">- "chan_nr=0x%02x at control level %d (%d dBm)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, chan_nr, new_power,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(band, new_power));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS new_power at control level %d (%d dBm)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ new_power, ms_pwr_dbm(band, new_power));</span><br><span> </span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_INFO, "%s MS new_power of trx=%u chan_nr=0x%02x from "</span><br><span style="color: hsl(0, 100%, 40%);">- "control level %d (%d dBm) to %d (%d dBm)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS new_power from control level %d (%d dBm) to %d (%d dBm)\n",</span><br><span> (diff > 0) ? "Raising" : "Lowering",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, chan_nr, lchan->ms_power_ctrl.current,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(band, lchan->ms_power_ctrl.current), new_power,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(band, new_power));</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ms_power_ctrl.current, ms_pwr_dbm(band, lchan->ms_power_ctrl.current),</span><br><span style="color: hsl(120, 100%, 40%);">+ new_power, ms_pwr_dbm(band, new_power));</span><br><span> </span><br><span> /* store the resulting new MS power level in the lchan */</span><br><span> lchan->ms_power_ctrl.current = new_power;</span><br><span>@@ -99,15 +94,16 @@</span><br><span> }</span><br><span> </span><br><span> /*! Input a new RSSI value into the MS power control loop for the given logical channel.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param lchan logical channel</span><br><span> * \param chan_state L1 channel state of the logical channel.</span><br><span> * \param rssi Received Signal Strength Indication (in dBm) */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ms_power_val(struct l1sched_chan_state *chan_state, int8_t rssi)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ms_power_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int8_t rssi)</span><br><span> {</span><br><span> /* ignore inserted dummy frames, treat as lost frames */</span><br><span> if (rssi < -127)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got RSSI value of %d\n", rssi);</span><br><span> </span><br><span> chan_state->meas.rssi_count++;</span><br><span> </span><br><span>@@ -122,10 +118,8 @@</span><br><span> }</span><br><span> </span><br><span> /*! Process a single clock tick of the MS power control loop.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param lchan Logical channel to which the clock tick applies</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] chan_nr RSL channel number (for logging purpose) */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ms_power_clock(struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_nr, struct l1sched_chan_state *chan_state)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param lchan Logical channel to which the clock tick applies */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ms_power_clock(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state)</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span> struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span>@@ -137,7 +131,7 @@</span><br><span> if (!(chan_state->meas.clock & 1))</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Got SACCH master clock at RSSI count %d\n",</span><br><span> chan_state->meas.rssi_count);</span><br><span> </span><br><span> /* wait for initial burst */</span><br><span>@@ -146,10 +140,8 @@</span><br><span> </span><br><span> /* if no burst was received from MS at clock */</span><br><span> if (chan_state->meas.rssi_count == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_NOTICE, "LOST SACCH frame of trx=%u "</span><br><span style="color: hsl(0, 100%, 40%);">- "chan_nr=0x%02x, so we raise MS power\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_diff(lchan, chan_nr, MS_RAISE_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, "LOST SACCH frame, so we raise MS power\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_diff(lchan, MS_RAISE_MAX);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -169,12 +161,11 @@</span><br><span> chan_state->meas.rssi_valid_count = 0;</span><br><span> </span><br><span> /* change RSSI */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current "</span><br><span style="color: hsl(0, 100%, 40%);">- "MS power: %d (%d dBm) of trx=%u chan_nr=0x%02x\n", rssi,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current "</span><br><span style="color: hsl(120, 100%, 40%);">+ "MS power: %d (%d dBm)\n", rssi,</span><br><span> pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current),</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current));</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_diff(lchan, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -185,11 +176,8 @@</span><br><span> * Timing Advance loop</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void ta_val(struct gsm_lchan *lchan, uint8_t chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- struct l1sched_chan_state *chan_state, int16_t toa256)</span><br><span style="color: hsl(120, 100%, 40%);">+void ta_val(struct gsm_lchan *lchan, struct l1sched_chan_state *chan_state, int16_t toa256)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx = lchan->ts->trx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* check if the current L1 header acks to the current ordered TA */</span><br><span> if (lchan->meas.l1_info[1] != lchan->rqd_ta)</span><br><span> return;</span><br><span>@@ -204,21 +192,16 @@</span><br><span> </span><br><span> /* check for change of TOA */</span><br><span> if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is too "</span><br><span style="color: hsl(0, 100%, 40%);">- "early (%d), now lowering TA from %d to %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, chan_nr, toa256, lchan->rqd_ta,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rqd_ta - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ toa256, lchan->rqd_ta, lchan->rqd_ta - 1);</span><br><span> lchan->rqd_ta--;</span><br><span> } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < 63) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is too "</span><br><span style="color: hsl(0, 100%, 40%);">- "late (%d), now raising TA from %d to %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, chan_nr, toa256, lchan->rqd_ta,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rqd_ta + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too late (%d), now raising TA from %d to %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ toa256, lchan->rqd_ta, lchan->rqd_ta + 1);</span><br><span> lchan->rqd_ta++;</span><br><span> } else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_INFO, "TOA of trx=%u chan_nr=0x%02x is "</span><br><span style="color: hsl(0, 100%, 40%);">- "correct (%d), keeping current TA of %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nr, chan_nr, toa256, lchan->rqd_ta);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is correct (%d), keeping current TA of %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ toa256, lchan->rqd_ta);</span><br><span> </span><br><span> chan_state->meas.toa_num = 0;</span><br><span> chan_state->meas.toa256_sum = 0;</span><br><span>@@ -240,11 +223,11 @@</span><br><span> </span><br><span> /* if MS power control loop is enabled, handle it */</span><br><span> if (pinst->phy_link->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_val(chan_state, rssi);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_val(lchan, chan_state, rssi);</span><br><span> </span><br><span> /* if TA loop is enabled, handle it */</span><br><span> if (pinst->phy_link->u.osmotrx.trx_ta_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- ta_val(lchan, chan_nr, chan_state, toa256);</span><br><span style="color: hsl(120, 100%, 40%);">+ ta_val(lchan, chan_state, toa256);</span><br><span> }</span><br><span> </span><br><span> /*! Called once every downlink SACCH block needs to be sent. */</span><br><span>@@ -256,7 +239,7 @@</span><br><span> struct phy_instance *pinst = trx_phy_instance(l1t->trx);</span><br><span> </span><br><span> if (pinst->phy_link->u.osmotrx.trx_ms_power_loop)</span><br><span style="color: hsl(0, 100%, 40%);">- ms_power_clock(lchan, chan_nr, chan_state);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_power_clock(lchan, chan_state);</span><br><span> </span><br><span> /* count the number of SACCH clocks */</span><br><span> chan_state->meas.clock++;</span><br><span>@@ -297,19 +280,17 @@</span><br><span> chan_state->ber_num = 0;</span><br><span> chan_state->ber_sum = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_DEBUG, "Current bit error rate (BER) %.6f "</span><br><span style="color: hsl(0, 100%, 40%);">- "codec id %d of trx=%u chan_nr=0x%02x\n", ber,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->ul_ft, trx->nr, chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Current bit error rate (BER) %.6f "</span><br><span style="color: hsl(120, 100%, 40%);">+ "codec id %d\n", ber, chan_state->ul_ft);</span><br><span> </span><br><span> /* degrade */</span><br><span> if (chan_state->dl_cmr > 0) {</span><br><span> /* degrade, if ber is above threshold FIXME: C/I */</span><br><span> if (ber ></span><br><span> lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr-1].threshold) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f "</span><br><span style="color: hsl(0, 100%, 40%);">- "from codec id %d to %d of trx=%u "</span><br><span style="color: hsl(0, 100%, 40%);">- "chan_nr=0x%02x\n", ber, chan_state->dl_cmr,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->dl_cmr - 1, trx->nr, chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f "</span><br><span style="color: hsl(120, 100%, 40%);">+ "from codec id %d to %d\n", ber, chan_state->dl_cmr,</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->dl_cmr - 1);</span><br><span> chan_state->dl_cmr--;</span><br><span> }</span><br><span> return;</span><br><span>@@ -321,10 +302,9 @@</span><br><span> if (ber <</span><br><span> lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold</span><br><span> - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].hysteresis) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f "</span><br><span style="color: hsl(0, 100%, 40%);">- "from codec id %d to %d of trx=%u "</span><br><span style="color: hsl(0, 100%, 40%);">- "chan_nr=0x%02x\n", ber, chan_state->dl_cmr,</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->dl_cmr + 1, trx->nr, chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f "</span><br><span style="color: hsl(120, 100%, 40%);">+ "from codec id %d to %d\n", ber, chan_state->dl_cmr,</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->dl_cmr + 1);</span><br><span> chan_state->dl_cmr++;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12289">change 12289</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/12289"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6976dd7444c26b1f52741bc367b0311ebbef1718 </div>
<div style="display:none"> Gerrit-Change-Number: 12289 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>