<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/19646">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">devices: reset internal smart sample buffers upon stop<br><br>They are too smart, they keep the timestamps.<br><br>Change-Id: Idb4b8f03eb5ffdfd6d3fdbc137b20e3ddc4cfa65<br>---<br>M Transceiver52M/device/common/smpl_buf.cpp<br>M Transceiver52M/device/common/smpl_buf.h<br>M Transceiver52M/device/ipc/IPCDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>4 files changed, 22 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/common/smpl_buf.cpp b/Transceiver52M/device/common/smpl_buf.cpp</span><br><span>index ceca000..e57eb0c 100644</span><br><span>--- a/Transceiver52M/device/common/smpl_buf.cpp</span><br><span>+++ b/Transceiver52M/device/common/smpl_buf.cpp</span><br><span>@@ -28,9 +28,9 @@</span><br><span> #include <inttypes.h></span><br><span> </span><br><span> smpl_buf::smpl_buf(size_t len)</span><br><span style="color: hsl(0, 100%, 40%);">- : buf_len(len), time_start(0), time_end(0),</span><br><span style="color: hsl(0, 100%, 40%);">- data_start(0), data_end(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ : buf_len(len)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ reset();</span><br><span> data = new uint32_t[len];</span><br><span> }</span><br><span> </span><br><span>@@ -39,6 +39,14 @@</span><br><span> delete[] data;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void smpl_buf::reset()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ time_start = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ time_end = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ data_start = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ data_end = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ssize_t smpl_buf::avail_smpls(TIMESTAMP timestamp) const</span><br><span> {</span><br><span> if (timestamp < time_start)</span><br><span>diff --git a/Transceiver52M/device/common/smpl_buf.h b/Transceiver52M/device/common/smpl_buf.h</span><br><span>index 0b49b82..ff02baf 100644</span><br><span>--- a/Transceiver52M/device/common/smpl_buf.h</span><br><span>+++ b/Transceiver52M/device/common/smpl_buf.h</span><br><span>@@ -44,6 +44,10 @@</span><br><span> smpl_buf(size_t len);</span><br><span> ~smpl_buf();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /** Reset this buffer, keeps the size</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ void reset();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /** Query number of samples available for reading</span><br><span> @param timestamp time of first sample</span><br><span> @return number of available samples or error</span><br><span>diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>index 4a1f8b6..32a46e5 100644</span><br><span>--- a/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>+++ b/Transceiver52M/device/ipc/IPCDevice.cpp</span><br><span>@@ -980,6 +980,10 @@</span><br><span> </span><br><span> LOGC(DDEV, NOTICE) << "All channels stopped, terminating...";</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* reset internal buffer timestamps */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (size_t i = 0; i < rx_buffers.size(); i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_buffers[i]->reset();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> started = false;</span><br><span> return true;</span><br><span> }</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 43b9f9c..143a061 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -750,6 +750,10 @@</span><br><span> async_event_thrd->join();</span><br><span> delete async_event_thrd;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* reset internal buffer timestamps */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (size_t i = 0; i < rx_buffers.size(); i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_buffers[i]->reset();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> started = false;</span><br><span> return true;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/19646">change 19646</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-trx/+/19646"/><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-Change-Id: Idb4b8f03eb5ffdfd6d3fdbc137b20e3ddc4cfa65 </div>
<div style="display:none"> Gerrit-Change-Number: 19646 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>