<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20723">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">measurement: use LOGPLCHAN() macro in lchan_meas_check_compute()<br><br>Change-Id: Ia73fd766ddce3fd03d0f45b72cb2d056fae781fc<br>---<br>M src/common/measurement.c<br>1 file changed, 32 insertions(+), 32 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/23/20723/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 68b19a0..22f783d 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -556,8 +556,8 @@</span><br><span> if (!is_meas_complete(lchan, fn))</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_DEBUG, "%s Calculating measurement results for physical channel:%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), gsm_pchan_name(ts_pchan(lchan->ts)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_DEBUG, "Calculating measurement results "</span><br><span style="color: hsl(120, 100%, 40%);">+ "for physical channel: %s\n", gsm_pchan_name(ts_pchan(lchan->ts)));</span><br><span> </span><br><span> /* Note: Some phys will send no measurement indication at all</span><br><span> * when a block is lost. Also in DTX mode blocks are left out</span><br><span>@@ -579,11 +579,11 @@</span><br><span> num_ul_meas_excess = lchan->meas.num_ul_meas - num_ul_meas_expect;</span><br><span> num_ul_meas = num_ul_meas_expect;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_DEBUG, "%s received %u UL measurements, expected %u\n", gsm_lchan_name(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->meas.num_ul_meas, num_ul_meas_expect);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_DEBUG, "Received %u UL measurements, expected %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas.num_ul_meas, num_ul_meas_expect);</span><br><span> if (num_ul_meas_excess)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_DEBUG, "%s received %u excess UL measurements\n", gsm_lchan_name(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- num_ul_meas_excess);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_DEBUG, "Received %u excess UL measurements\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ num_ul_meas_excess);</span><br><span> </span><br><span> /* Measurement computation step 1: add up */</span><br><span> for (i = 0; i < num_ul_meas; i++) {</span><br><span>@@ -639,19 +639,17 @@</span><br><span> }</span><br><span> </span><br><span> if (lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s received UL measurements contain %u SUB measurements, expected %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), num_meas_sub_actual,</span><br><span style="color: hsl(0, 100%, 40%);">- num_meas_sub_expect);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received UL measurements contain %u SUB measurements, expected %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ num_meas_sub_actual, num_meas_sub_expect);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s received UL measurements contain %u SUB measurements, expected at least %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), num_meas_sub_actual,</span><br><span style="color: hsl(0, 100%, 40%);">- num_meas_sub_expect);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received UL measurements contain %u SUB measurements, expected at least %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ num_meas_sub_actual, num_meas_sub_expect);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_DEBUG, "%s replaced %u measurements with dummy values, from which %u were SUB measurements\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), num_ul_meas_subst, num_meas_sub_subst);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_DEBUG, "Replaced %u measurements with dummy values, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "from which %u were SUB measurements\n", num_ul_meas_subst, num_meas_sub_subst);</span><br><span> </span><br><span> /* Normally the logic above should make sure that there is</span><br><span> * always the exact amount of SUB measurements taken into</span><br><span>@@ -662,17 +660,15 @@</span><br><span> * measurements when there is no more room in the interval. */</span><br><span> if (lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) {</span><br><span> if (num_meas_sub != num_meas_sub_expect) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s Incorrect number of SUB measurements detected! (%u vs exp %u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), num_meas_sub,</span><br><span style="color: hsl(0, 100%, 40%);">- num_meas_sub_expect);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Incorrect number of SUB measurements detected! "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(%u vs exp %u)\n", num_meas_sub, num_meas_sub_expect);</span><br><span> }</span><br><span> } else {</span><br><span> if (num_meas_sub < num_meas_sub_expect) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s Incorrect number of SUB measurements detected! (%u vs exp >=%u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), num_meas_sub,</span><br><span style="color: hsl(0, 100%, 40%);">- num_meas_sub_expect);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Incorrect number of SUB measurements detected! "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(%u vs exp >=%u)\n", num_meas_sub, num_meas_sub_expect);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -699,10 +695,12 @@</span><br><span> else</span><br><span> irssi_sub_sum = irssi_sub_sum / num_meas_sub_actual;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_INFO, "%s Computed TA256(% 4d) BER-FULL(%2u.%02u%%), RSSI-FULL(-%3udBm), "</span><br><span style="color: hsl(0, 100%, 40%);">- "BER-SUB(%2u.%02u%%), RSSI-SUB(-%3udBm)\n", gsm_lchan_name(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- ta256b_sum, ber_full_sum / 100,</span><br><span style="color: hsl(0, 100%, 40%);">- ber_full_sum % 100, irssi_full_sum, ber_sub_sum / 100, ber_sub_sum % 100, irssi_sub_sum);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Computed TA256(% 4d) BER-FULL(%2u.%02u%%), RSSI-FULL(-%3udBm), "</span><br><span style="color: hsl(120, 100%, 40%);">+ "BER-SUB(%2u.%02u%%), RSSI-SUB(-%3udBm)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ta256b_sum, ber_full_sum / 100, ber_full_sum % 100,</span><br><span style="color: hsl(120, 100%, 40%);">+ irssi_full_sum, ber_sub_sum / 100, ber_sub_sum % 100,</span><br><span style="color: hsl(120, 100%, 40%);">+ irssi_sub_sum);</span><br><span> </span><br><span> /* store results */</span><br><span> mru = &lchan->meas.ul_res;</span><br><span>@@ -712,10 +710,12 @@</span><br><span> mru->sub.rx_qual = ber10k_to_rxqual(ber_sub_sum);</span><br><span> lchan->meas.ms_toa256 = ta256b_sum;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMEAS, LOGL_INFO, "%s UL MEAS RXLEV_FULL(%u), RXLEV_SUB(%u),"</span><br><span style="color: hsl(0, 100%, 40%);">- "RXQUAL_FULL(%u), RXQUAL_SUB(%u), num_meas_sub(%u), num_ul_meas(%u) \n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- mru->full.rx_lev, mru->sub.rx_lev, mru->full.rx_qual, mru->sub.rx_qual, num_meas_sub, num_ul_meas_expect);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DMEAS, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "UL MEAS RXLEV_FULL(%u), RXLEV_SUB(%u), RXQUAL_FULL(%u), RXQUAL_SUB(%u), "</span><br><span style="color: hsl(120, 100%, 40%);">+ "num_meas_sub(%u), num_ul_meas(%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ mru->full.rx_lev, mru->sub.rx_lev,</span><br><span style="color: hsl(120, 100%, 40%);">+ mru->full.rx_qual, mru->sub.rx_qual,</span><br><span style="color: hsl(120, 100%, 40%);">+ num_meas_sub, num_ul_meas_expect);</span><br><span> </span><br><span> lchan->meas.flags |= LC_UL_M_F_RES_VALID;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20723">change 20723</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-bts/+/20723"/><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-Change-Id: Ia73fd766ddce3fd03d0f45b72cb2d056fae781fc </div>
<div style="display:none"> Gerrit-Change-Number: 20723 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>