<p>dexter <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10762">View Change</a></p><div style="white-space:pre-wrap">Approvals:
dexter: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">measurement: display fn_mod when measuremnet is added<br><br>When adding a new measurement also log the frame number by the modulus<br>of the measurement interval to simplify debuggung<br><br>Change-Id: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a<br>---<br>M src/common/measurement.c<br>1 file changed, 32 insertions(+), 7 deletions(-)<br><br></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 59f5d83..1e547c8 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -415,21 +415,46 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* determine the measurement interval modulus by a given lchan */</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t modulus_by_lchan(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 104;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_CCCH_SDCCH4:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 102;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Invalid */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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> /* receive a L1 uplink measurement from L1 (this function is only used</span><br><span> * internally, it is public to call it from unit-tests) */</span><br><span> int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn_mod = fn % modulus_by_lchan(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (lchan->state != LCHAN_S_ACTIVE) {</span><br><span> LOGPFN(DMEAS, LOGL_NOTICE, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s measurement during state: %s, num_ul_meas=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), gsm_lchans_name(lchan->state),</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->meas.num_ul_meas);</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s measurement during state: %s, num_ul_meas=%d, fn_mod=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_name(lchan), gsm_lchans_name(lchan->state),</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->meas.num_ul_meas, fn_mod);</span><br><span> }</span><br><span> </span><br><span> if (lchan->meas.num_ul_meas >= ARRAY_SIZE(lchan->meas.uplink)) {</span><br><span> LOGPFN(DMEAS, LOGL_NOTICE, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s no space for uplink measurement, num_ul_meas=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), lchan->meas.num_ul_meas);</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s no space for uplink measurement, num_ul_meas=%d, fn_mod=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_name(lchan), lchan->meas.num_ul_meas, fn_mod);</span><br><span> return -ENOSPC;</span><br><span> }</span><br><span> </span><br><span>@@ -438,8 +463,8 @@</span><br><span> if (!ulm->is_sub)</span><br><span> ulm->is_sub = ts45008_83_is_sub(lchan, fn, false);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGPFN(DMEAS, fn, "%s adding measurement (is_sub=%u), num_ul_meas=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), ulm->is_sub, lchan->meas.num_ul_meas);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPFN(DMEAS, fn, "%s adding measurement (is_sub=%u), num_ul_meas=%d, fn_mod=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_name(lchan), ulm->is_sub, lchan->meas.num_ul_meas, fn_mod);</span><br><span> </span><br><span> memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm,</span><br><span> sizeof(*ulm));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10762">change 10762</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/10762"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I77a4d947dab32de0d5717ebf13bd8de6179dfe6a </div>
<div style="display:none"> Gerrit-Change-Number: 10762 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Vadim Yanitskiy <axilirator@gmail.com> </div>