<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15258">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop old setPriority related code<br><br>This code is not needed anymore since we are setting SCHED_RR scheduler<br>with a real time priority in main thread during startup, so all threads<br>will inherit same rt priority, which should be enough to keep the<br>process working reliably even on high system loads (from non rt<br>processes).<br><br>osmo-trx was tested to be reliable during test with stress-ng as<br>explained in related ticket below.<br><br>Related: OS#2344<br>Change-Id: I3a88946dd71e9aeeaac9d19d396e2236c302b608<br>---<br>M Transceiver52M/Transceiver.cpp<br>M Transceiver52M/Transceiver.h<br>M Transceiver52M/device/common/radioDevice.h<br>M Transceiver52M/device/lms/LMSDevice.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>M Transceiver52M/device/uhd/UHDDevice.h<br>M Transceiver52M/device/usrp1/USRPDevice.h<br>M Transceiver52M/radioInterface.h<br>8 files changed, 0 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp</span><br><span>index 4da1876..2d5c04e 100644</span><br><span>--- a/Transceiver52M/Transceiver.cpp</span><br><span>+++ b/Transceiver52M/Transceiver.cpp</span><br><span>@@ -1126,8 +1126,6 @@</span><br><span> snprintf(thread_name, 16, "RxUpper%zu", num);</span><br><span> set_selfthread_name(thread_name);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx->setPriority(0.42);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> while (1) {</span><br><span> trx->driveReceiveFIFO(num);</span><br><span> pthread_testcancel();</span><br><span>@@ -1139,8 +1137,6 @@</span><br><span> {</span><br><span> set_selfthread_name("RxLower");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- transceiver->setPriority(0.45);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> while (1) {</span><br><span> transceiver->driveReceiveRadio();</span><br><span> pthread_testcancel();</span><br><span>@@ -1152,8 +1148,6 @@</span><br><span> {</span><br><span> set_selfthread_name("TxLower");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- transceiver->setPriority(0.44);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> while (1) {</span><br><span> transceiver->driveTxFIFO();</span><br><span> pthread_testcancel();</span><br><span>@@ -1190,8 +1184,6 @@</span><br><span> snprintf(thread_name, 16, "TxUpper%zu", num);</span><br><span> set_selfthread_name(thread_name);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx->setPriority(0.40);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> while (1) {</span><br><span> trx->driveTxPriorityQueue(num);</span><br><span> pthread_testcancel();</span><br><span>diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h</span><br><span>index 18dc5f2..1a4d28f 100644</span><br><span>--- a/Transceiver52M/Transceiver.h</span><br><span>+++ b/Transceiver52M/Transceiver.h</span><br><span>@@ -247,9 +247,6 @@</span><br><span> </span><br><span> void reset();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** set priority on current thread */</span><br><span style="color: hsl(0, 100%, 40%);">- void setPriority(float prio = 0.5) { mRadioInterface->setPriority(prio); }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void logRxBurst(size_t chan, const struct trx_ul_burst_ind *bi);</span><br><span> };</span><br><span> </span><br><span>diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h</span><br><span>index cd378a8..e637611 100644</span><br><span>--- a/Transceiver52M/device/common/radioDevice.h</span><br><span>+++ b/Transceiver52M/device/common/radioDevice.h</span><br><span>@@ -70,9 +70,6 @@</span><br><span> /** Get the Tx window type */</span><br><span> virtual enum TxWindowType getWindowType()=0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** Enable thread priority */</span><br><span style="color: hsl(0, 100%, 40%);">- virtual void setPriority(float prio = 0.5) = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /**</span><br><span> Read samples from the radio.</span><br><span> @param buf preallocated buf to contain read result</span><br><span>diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>index bc79f97..47bac94 100644</span><br><span>--- a/Transceiver52M/device/lms/LMSDevice.h</span><br><span>+++ b/Transceiver52M/device/lms/LMSDevice.h</span><br><span>@@ -85,10 +85,6 @@</span><br><span> /** Stop the LMS */</span><br><span> bool stop();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** Set priority not supported */</span><br><span style="color: hsl(0, 100%, 40%);">- void setPriority(float prio = 0.5) {</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum TxWindowType getWindowType() {</span><br><span> return TX_WINDOW_LMS1;</span><br><span> }</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 8bb94d6..5b38df4 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -125,7 +125,6 @@</span><br><span> void *async_event_loop(uhd_device *dev)</span><br><span> {</span><br><span> set_selfthread_name("UHDAsyncEvent");</span><br><span style="color: hsl(0, 100%, 40%);">- dev->setPriority(0.43);</span><br><span> </span><br><span> while (1) {</span><br><span> dev->recv_async_msg();</span><br><span>@@ -643,12 +642,6 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void uhd_device::setPriority(float prio)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uhd::set_thread_priority_safe(prio);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls)</span><br><span> {</span><br><span> if (!num_smpls) {</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>index d5a6348..944578a 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.h</span><br><span>@@ -71,7 +71,6 @@</span><br><span> bool start();</span><br><span> bool stop();</span><br><span> bool restart();</span><br><span style="color: hsl(0, 100%, 40%);">- void setPriority(float prio);</span><br><span> enum TxWindowType getWindowType() { return tx_window; }</span><br><span> </span><br><span> int readSamples(std::vector<short *> &bufs, int len, bool *overrun,</span><br><span>diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>index 9a2426c..4123c7d 100644</span><br><span>--- a/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>+++ b/Transceiver52M/device/usrp1/USRPDevice.h</span><br><span>@@ -107,9 +107,6 @@</span><br><span> /** Stop the USRP */</span><br><span> bool stop();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** Set priority not supported */</span><br><span style="color: hsl(0, 100%, 40%);">- void setPriority(float prio = 0.5) { }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum TxWindowType getWindowType() { return TX_WINDOW_USRP1; }</span><br><span> </span><br><span> /**</span><br><span>diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h</span><br><span>index f19a8dc..dcfb67f 100644</span><br><span>--- a/Transceiver52M/radioInterface.h</span><br><span>+++ b/Transceiver52M/radioInterface.h</span><br><span>@@ -127,9 +127,6 @@</span><br><span> /** returns the full-scale receive amplitude **/</span><br><span> double fullScaleOutputValue();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /** set thread priority on current thread */</span><br><span style="color: hsl(0, 100%, 40%);">- void setPriority(float prio = 0.5) { mRadio->setPriority(prio); }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /** get transport window type of attached device */</span><br><span> enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15258">change 15258</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/+/15258"/><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: I3a88946dd71e9aeeaac9d19d396e2236c302b608 </div>
<div style="display:none"> Gerrit-Change-Number: 15258 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>