<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12086">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lms: Make sure LMS_Close is called when Device is torn down<br><br>This change fixes lots of memory leaks inside libLimeSuite as<br>announced by ASan after exiting the osmo-trx process (throgh<br>CTRL+C for instance).<br><br>This way also we make sure libLimeSuite can communicate with the HW and<br>close whatever subsystems were enabled during LMS_Open time.<br><br>Change-Id: I56ffb87079e34aa2d0322fd2ca6429742f9f7640<br>---<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/lms/LMSDevice.h<br>2 files changed, 11 insertions(+), 0 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 2ceca0d..144f75d 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -57,6 +57,15 @@</span><br><span>        m_last_tx_overruns.resize(chans, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+LMSDevice::~LMSDevice()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     LOGC(DDEV, INFO) << "Closing LMS device";</span><br><span style="color: hsl(120, 100%, 40%);">+     if (m_lms_dev) {</span><br><span style="color: hsl(120, 100%, 40%);">+              LMS_Close(m_lms_dev);</span><br><span style="color: hsl(120, 100%, 40%);">+         m_lms_dev = NULL;</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> static void lms_log_callback(int lvl, const char *msg)</span><br><span> {</span><br><span>        /* map lime specific log levels */</span><br><span>@@ -204,6 +213,7 @@</span><br><span> out_close:</span><br><span>       LOGC(DDEV, ALERT) << "Error in LMS open, closing: " << LMS_GetLastErrorMessage();</span><br><span>      LMS_Close(m_lms_dev);</span><br><span style="color: hsl(120, 100%, 40%);">+ m_lms_dev = NULL;</span><br><span>    return -1;</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 6635c13..d1a8813 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -74,6 +74,7 @@</span><br><span>     LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset,</span><br><span>                   const std::vector<std::string>& tx_paths,</span><br><span>                  const std::vector<std::string>& rx_paths);</span><br><span style="color: hsl(120, 100%, 40%);">+        ~LMSDevice();</span><br><span> </span><br><span>    /** Instantiate the LMS */</span><br><span>   int open(const std::string &args, int ref, bool swap_channels);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12086">change 12086</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/12086"/><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: I56ffb87079e34aa2d0322fd2ca6429742f9f7640 </div>
<div style="display:none"> Gerrit-Change-Number: 12086 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: Pau Espin Pedrol <pespin@sysmocom.de> </div>