<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13785">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;">Move duplicated thread_enable_cancel to CommonLibs<br><br>Change-Id: I1a479b59bdda01233273dfa919bd678edbe34708<br>---<br>M CommonLibs/Threads.cpp<br>M CommonLibs/Threads.h<br>M Transceiver52M/device/lms/LMSDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>4 files changed, 7 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp</span><br><span>index 2988e12..c056d69 100644</span><br><span>--- a/CommonLibs/Threads.cpp</span><br><span>+++ b/CommonLibs/Threads.cpp</span><br><span>@@ -122,6 +122,12 @@</span><br><span>      }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void thread_enable_cancel(bool cancel)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :</span><br><span style="color: hsl(120, 100%, 40%);">+                 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void Thread::start(void *(*task)(void*), void *arg)</span><br><span> {</span><br><span>      assert(mThread==((pthread_t)0));</span><br><span>diff --git a/CommonLibs/Threads.h b/CommonLibs/Threads.h</span><br><span>index 3b76985..4c5b9ee 100644</span><br><span>--- a/CommonLibs/Threads.h</span><br><span>+++ b/CommonLibs/Threads.h</span><br><span>@@ -142,6 +142,7 @@</span><br><span>  thread.start((void *(*)(void*))function, (void*)argument);</span><br><span> </span><br><span> void set_selfthread_name(const char *name);</span><br><span style="color: hsl(120, 100%, 40%);">+void thread_enable_cancel(bool cancel);</span><br><span> </span><br><span> /** A C++ wrapper for pthread threads.  */</span><br><span> class Thread {</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>index b924fa7..0cd41d3 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.cpp</span><br><span>@@ -90,12 +90,6 @@</span><br><span>     LOGLV(DLMS, lvl_map[lvl]) << msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void thread_enable_cancel(bool cancel)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-  cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :</span><br><span style="color: hsl(0, 100%, 40%);">-           pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void print_range(const char* name, lms_range_t *range)</span><br><span> {</span><br><span>        LOGC(DDEV, INFO) << name << ": Min=" << range->min << " Max=" << range->max</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 765150f..46284e5 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -357,12 +357,6 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void thread_enable_cancel(bool cancel)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-    cancel ? pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) :</span><br><span style="color: hsl(0, 100%, 40%);">-           pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> uhd_device::uhd_device(size_t tx_sps, size_t rx_sps,</span><br><span>                     InterfaceType iface, size_t chans, double lo_offset,</span><br><span>                 const std::vector<std::string>& tx_paths,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13785">change 13785</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/13785"/><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: I1a479b59bdda01233273dfa919bd678edbe34708 </div>
<div style="display:none"> Gerrit-Change-Number: 13785 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>