<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12125">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Move {under,over}run checks into separate method<br><br>Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>2 files changed, 16 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index 9804bbd..fa9e395 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -499,13 +499,26 @@</span><br><span> return GSM::Time(6,7);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void LMSDevice::update_stream_stats(size_t chan, bool * underrun, bool * overrun)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ lms_stream_status_t status;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (LMS_GetStreamStatus(&m_lms_stream_rx[chan], &status) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (status.underrun > m_last_rx_underruns[chan])</span><br><span style="color: hsl(120, 100%, 40%);">+ *underrun = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ m_last_rx_underruns[chan] = status.underrun;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (status.overrun > m_last_rx_overruns[chan])</span><br><span style="color: hsl(120, 100%, 40%);">+ *overrun = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ m_last_rx_overruns[chan] = status.overrun;</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> // NOTE: Assumes sequential reads</span><br><span> int LMSDevice::readSamples(std::vector < short *>&bufs, int len, bool * overrun,</span><br><span> TIMESTAMP timestamp, bool * underrun, unsigned *RSSI)</span><br><span> {</span><br><span> int rc = 0;</span><br><span> unsigned int i;</span><br><span style="color: hsl(0, 100%, 40%);">- lms_stream_status_t status;</span><br><span> lms_stream_meta_t rx_metadata = {};</span><br><span> rx_metadata.flushPartialPacket = false;</span><br><span> rx_metadata.waitForTimestamp = false;</span><br><span>@@ -528,16 +541,7 @@</span><br><span> }</span><br><span> if (timestamp != (TIMESTAMP)rx_metadata.timestamp)</span><br><span> LOGC(DDEV, ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (LMS_GetStreamStatus(&m_lms_stream_rx[i], &status) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (status.underrun > m_last_rx_underruns[i])</span><br><span style="color: hsl(0, 100%, 40%);">- *underrun = true;</span><br><span style="color: hsl(0, 100%, 40%);">- m_last_rx_underruns[i] = status.underrun;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (status.overrun > m_last_rx_overruns[i])</span><br><span style="color: hsl(0, 100%, 40%);">- *overrun = true;</span><br><span style="color: hsl(0, 100%, 40%);">- m_last_rx_overruns[i] = status.overrun;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ update_stream_stats(i, underrun, overrun);</span><br><span> thread_enable_cancel(true);</span><br><span> }</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index d1a8813..fde2408 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -67,6 +67,7 @@</span><br><span> </span><br><span> int get_ant_idx(const std::string & name, bool dir_tx, size_t chan);</span><br><span> bool flush_recv(size_t num_pkts);</span><br><span style="color: hsl(120, 100%, 40%);">+ void update_stream_stats(size_t chan, bool * underrun, bool * overrun);</span><br><span> </span><br><span> public:</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12125">change 12125</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/12125"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7f450aa79f6285d14826c40ecfdd9490d00509ef </div>
<div style="display:none"> Gerrit-Change-Number: 12125 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>