July 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-trx[master]: ms : rename var
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32948 ) Change subject: ms : rename var ...................................................................... ms : rename var Change-Id: Ia90a9f73fdb1f96fa5bd7f27b3c191ce0ba6c65d --- M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/ms.h 2 files changed, 17 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index ff0ce59..ca3339b 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -279,13 +279,13 @@ if (stop_lower_threads_flag) return; auto fn = get_rx_burst_handler_fn(rx_bh()); - rx_task = std::thread(fn); - set_name_aff_sched(rx_task.native_handle(), sched_params::thread_names::RXRUN); + lower_rx_task = std::thread(fn); + set_name_aff_sched(lower_rx_task.native_handle(), sched_params::thread_names::RXRUN); usleep(1000); auto fn2 = get_tx_burst_handler_fn(tx_bh()); - tx_task = std::thread(fn2); - set_name_aff_sched(tx_task.native_handle(), sched_params::thread_names::TXRUN); + lower_tx_task = std::thread(fn2); + set_name_aff_sched(lower_tx_task.native_handle(), sched_params::thread_names::TXRUN); actually_enable_streams(); } @@ -301,9 +301,9 @@ stop_lower_threads_flag = true; close_device(); std::cerr << "dev closed..." << std::endl; - rx_task.join(); + lower_rx_task.join(); std::cerr << "L rx dead..." << std::endl; - tx_task.join(); + lower_tx_task.join(); std::cerr << "L tx dead..." << std::endl; } diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index d92f4b7..3b97d1b 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -245,8 +245,8 @@ int timing_advance; bool do_auto_gain; - std::thread rx_task; - std::thread tx_task; + std::thread lower_rx_task; + std::thread lower_tx_task; std::thread *calcrval_task; // provides bursts to upper rx thread -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia90a9f73fdb1f96fa5bd7f27b3c191ce0ba6c65d Gerrit-Change-Number: 32948 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-trx[master]: ms : rename var
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32947 ) Change subject: ms : rename var ...................................................................... ms : rename var Change-Id: I44e5d1770b248f107abce5683d5f7641655da764 --- M Transceiver52M/ms/bladerf_specific.h M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/uhd_specific.h 3 files changed, 19 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/ms/bladerf_specific.h b/Transceiver52M/ms/bladerf_specific.h index 85a2ea0..ba5c7f1 100644 --- a/Transceiver52M/ms/bladerf_specific.h +++ b/Transceiver52M/ms/bladerf_specific.h @@ -197,7 +197,7 @@ const int rxtxdelay; float rxgain, txgain; - static std::atomic<bool> stop_me_flag; + static std::atomic<bool> stop_lower_threads_flag; struct ms_trx_config { int tx_freq; @@ -384,7 +384,7 @@ static int to_skip = 0; dev_buf_t *rcd = (dev_buf_t *)samples; - if (stop_me_flag) + if (stop_lower_threads_flag) return BLADERF_STREAM_SHUTDOWN; if (to_skip < 120) // prevents weird overflows on startup @@ -409,7 +409,7 @@ if (samples) // put buffer address back into queue, ready to be reused trx->buf_mgmt.bufptrqueue.spsc_push(&ptr); - if (stop_me_flag) + if (stop_lower_threads_flag) return BLADERF_STREAM_SHUTDOWN; return BLADERF_STREAM_NO_DATA; @@ -420,7 +420,7 @@ { auto fn = [this] { int status = 0; - if (!stop_me_flag) + if (!stop_lower_threads_flag) status = bladerf_stream(rx_stream, BLADERF_RX_X1); if (status < 0) std::cerr << "rx stream error! " << bladerf_strerror(status) << std::endl; @@ -433,7 +433,7 @@ { auto fn = [this] { int status = 0; - if (!stop_me_flag) + if (!stop_lower_threads_flag) status = bladerf_stream(tx_stream, BLADERF_TX_X1); if (status < 0) std::cerr << "rx stream error! " << bladerf_strerror(status) << std::endl; diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index f338225..ff0ce59 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -50,7 +50,7 @@ #endif template <> -std::atomic<bool> ms_trx::base::stop_me_flag(false); +std::atomic<bool> ms_trx::base::stop_lower_threads_flag(false); void tx_test(ms_trx *t, ts_hitter_q_t *q, unsigned int *tsc) { @@ -276,7 +276,7 @@ void ms_trx::start() { - if (stop_me_flag) + if (stop_lower_threads_flag) return; auto fn = get_rx_burst_handler_fn(rx_bh()); rx_task = std::thread(fn); @@ -298,7 +298,7 @@ void ms_trx::stop_threads() { std::cerr << "killing threads..." << std::endl; - stop_me_flag = true; + stop_lower_threads_flag = true; close_device(); std::cerr << "dev closed..." << std::endl; rx_task.join(); diff --git a/Transceiver52M/ms/uhd_specific.h b/Transceiver52M/ms/uhd_specific.h index 07fc449..c8361e9 100644 --- a/Transceiver52M/ms/uhd_specific.h +++ b/Transceiver52M/ms/uhd_specific.h @@ -77,7 +77,7 @@ const unsigned int rxFullScale, txFullScale; const int rxtxdelay; float rxgain, txgain; - static std::atomic<bool> stop_me_flag; + static std::atomic<bool> stop_lower_threads_flag; virtual ~uhd_hw() { @@ -232,7 +232,7 @@ stream_cmd.time_spec = uhd::time_spec_t(); rx_stream->issue_stream_cmd(stream_cmd); - while (!stop_me_flag) { + while (!stop_lower_threads_flag) { rx_cb(burst_handler); } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I44e5d1770b248f107abce5683d5f7641655da764 Gerrit-Change-Number: 32947 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-trx[master]: ms: use single thread pool
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32946 ) Change subject: ms: use single thread pool ...................................................................... ms: use single thread pool ...so we don't spawn threads all the time. Used for gain avg/setting. Change-Id: Id675550f55e8ccbbbe6b0d91fbffd01b6ede15f7 --- M Transceiver52M/Makefile.am M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_lower.cpp A Transceiver52M/ms/threadpool.h 4 files changed, 134 insertions(+), 18 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index 875e9a1..296ff05 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -97,6 +97,7 @@ ms/ms_upper.h \ ms/itrq.h \ ms/sch.h \ + ms/threadpool.h \ grgsm_vitac/viterbi_detector.h \ grgsm_vitac/constants.h \ grgsm_vitac/grgsm_vitac.h diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index 7381397..d92f4b7 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -41,6 +41,7 @@ #include "Complex.h" #include "GSMCommon.h" #include "itrq.h" +#include "threadpool.h" const unsigned int ONE_TS_BURST_LEN = (3 + 58 + 26 + 58 + 3 + 8.25) * 4 /*sps*/; const unsigned int NUM_RXQ_FRAMES = 1; // rx thread <-> upper rx queue @@ -266,6 +267,7 @@ time_keeper timekeeper; int hw_cpus; sched_params::target hw_target; + single_thread_pool worker_thread; void start(); std::atomic<bool> upper_is_ready; @@ -291,6 +293,7 @@ hw_target(hw_cpus > 4 ? sched_params::target::ODROID : sched_params::target::PI4) { std::cerr << "scheduling for: " << (hw_cpus > 4 ? "odroid" : "pi4") << std::endl; + set_name_aff_sched(worker_thread.get_handle(), sched_params::thread_names::SCH_SEARCH); } virtual ~ms_trx() diff --git a/Transceiver52M/ms/ms_rx_lower.cpp b/Transceiver52M/ms/ms_rx_lower.cpp index e8d8e0e..dc0d56d 100644 --- a/Transceiver52M/ms/ms_rx_lower.cpp +++ b/Transceiver52M/ms/ms_rx_lower.cpp @@ -30,6 +30,8 @@ #include "ms.h" #include "grgsm_vitac/grgsm_vitac.h" +#include "threadpool.h" + extern "C" { #include "sch.h" } @@ -126,8 +128,11 @@ gainoffset = runmean < (rxFullScale / 2 ? 2 : 1); float newgain = runmean < rx_max_cutoff ? rxgain + gainoffset : rxgain - gainoffset; // FIXME: gian cutoff - if (newgain != rxgain && newgain <= 60) - std::thread([this, newgain] { setRxGain(newgain); }).detach(); + if (newgain != rxgain && newgain <= 60) { + auto gain_fun = [this, newgain] { setRxGain(newgain); }; + worker_thread.add_task(gain_fun); + } + runmean = 0; } gain_check = (gain_check + 1) % avgburst_num; @@ -217,26 +222,36 @@ return false; } +/* +accumulates a full big buffer consisting of 8*12 timeslots, then: +either +1) adjusts gain if necessary and starts over +2) searches and finds SCH and is done +*/ SCH_STATE ms_trx::search_for_sch(dev_buf_t *rcd) { static unsigned int sch_pos = 0; + auto to_copy = SCH_LEN_SPS - sch_pos; + if (sch_thread_done) return SCH_STATE::FOUND; if (rcv_done) return SCH_STATE::SEARCHING; - auto to_copy = SCH_LEN_SPS - sch_pos; - - if (SCH_LEN_SPS == to_copy) // first time + if (sch_pos == 0) // keep first ts for time delta calc first_sch_buf_rcv_ts = rcd->get_first_ts(); - if (!to_copy) { + if (to_copy) { + auto spsmax = rcd->actual_samples_per_buffer(); + if (to_copy > (unsigned int)spsmax) + sch_pos += rcd->readall(first_sch_buf + sch_pos); + else + sch_pos += rcd->read_n(first_sch_buf + sch_pos, 0, to_copy); + } else { // (!to_copy) sch_pos = 0; rcv_done = true; - std::thread([this] { - set_name_aff_sched(sched_params::thread_names::SCH_SEARCH); - + auto sch_search_fun = [this] { auto ptr = reinterpret_cast<const int16_t *>(first_sch_buf); const auto target_val = rxFullScale / 8; float sum = 0; @@ -255,16 +270,9 @@ if (!sch_thread_done) rcv_done = false; // retry! - return (bool)sch_thread_done; - }).detach(); + }; + worker_thread.add_task(sch_search_fun); } - - auto spsmax = rcd->actual_samples_per_buffer(); - if (to_copy > (unsigned int)spsmax) - sch_pos += rcd->readall(first_sch_buf + sch_pos); - else - sch_pos += rcd->read_n(first_sch_buf + sch_pos, 0, to_copy); - return SCH_STATE::SEARCHING; } diff --git a/Transceiver52M/ms/threadpool.h b/Transceiver52M/ms/threadpool.h new file mode 100644 index 0000000..a5dec97 --- /dev/null +++ b/Transceiver52M/ms/threadpool.h @@ -0,0 +1,92 @@ +#pragma once +/* + * (C) 2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Eric Wild <ewild(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <functional> +#include <thread> +#include <atomic> +#include <vector> +#include <future> +#include <mutex> +#include <queue> + +struct single_thread_pool { + std::mutex m; + std::condition_variable cv; + std::atomic<bool> stop_flag; + std::atomic<bool> is_ready; + std::deque<std::function<void()>> wq; + std::thread worker_thread; + + template <class F> + void add_task(F &&f) + { + std::unique_lock<std::mutex> l(m); + wq.emplace_back(std::forward<F>(f)); + cv.notify_one(); + return; + } + + single_thread_pool() : worker_thread(std::thread([this] { thread_loop(); })) + { + } + ~single_thread_pool() + { + stop(); + } + + std::thread::native_handle_type get_handle() + { + return worker_thread.native_handle(); + } + + private: + void stop() + { + { + std::unique_lock<std::mutex> l(m); + wq.clear(); + stop_flag = true; + cv.notify_one(); + } + worker_thread.join(); + } + + void thread_loop() + { + while (true) { + is_ready = true; + std::function<void()> f; + { + std::unique_lock<std::mutex> l(m); + if (wq.empty()) { + cv.wait(l, [&] { return !wq.empty() || stop_flag; }); + } + if (stop_flag) + return; + is_ready = false; + f = std::move(wq.front()); + wq.pop_front(); + } + f(); + } + } +}; \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id675550f55e8ccbbbe6b0d91fbffd01b6ede15f7 Gerrit-Change-Number: 32946 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-trx[master]: ms: use single thread pool
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32946 ) Change subject: ms: use single thread pool ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id675550f55e8ccbbbe6b0d91fbffd01b6ede15f7 Gerrit-Change-Number: 32946 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jul 2023 10:33:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: ms: block burst q to upper layer
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32945 ) Change subject: ms: block burst q to upper layer ...................................................................... ms: block burst q to upper layer The timekeeper should never wait for lazy readers, because that causes timekeeping and later usb transfers to fail. Change-Id: Id0aad606a296b2885617013ce6637204357b13d7 --- M Transceiver52M/ms/ms.h 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index dbf2e9a..7381397 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -116,7 +116,7 @@ }; }; -using rx_queue_t = spsc_cond<8 * NUM_RXQ_FRAMES, one_burst, true, true>; +using rx_queue_t = spsc_cond<8 * NUM_RXQ_FRAMES, one_burst, true, false>; enum class SCH_STATE { SEARCHING, FOUND }; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id0aad606a296b2885617013ce6637204357b13d7 Gerrit-Change-Number: 32945 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-trx[master]: ms: block burst q to upper layer
by Hoernchen 10 Jul '23

10 Jul '23

Attention is currently required from: pespin, dexter. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32945 ) Change subject: ms: block burst q to upper layer ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id0aad606a296b2885617013ce6637204357b13d7 Gerrit-Change-Number: 32945 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jul 2023 10:33:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Change return value of bts_supports_cm() from int to bool
by pespin 10 Jul '23

10 Jul '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33622 ) Change subject: Change return value of bts_supports_cm() from int to bool ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I72e30fe852ab69a162b117a534071ebddd4b16ba Gerrit-Change-Number: 33622 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 10 Jul 2023 10:31:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-trx[master]: ms: fix startup & shutdown of blade
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32944 ) Change subject: ms: fix startup & shutdown of blade ...................................................................... ms: fix startup & shutdown of blade One of the mystery bugs was that the blade ms needed two starts after powercycling the bladerf due to transfer timeouts. This is now fixed. Change-Id: I1cd8790191790f4861a70bc55c8f4c9993fa10c8 --- M Transceiver52M/ms/bladerf_specific.h M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h M Transceiver52M/ms/uhd_specific.h 5 files changed, 76 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/Transceiver52M/ms/bladerf_specific.h b/Transceiver52M/ms/bladerf_specific.h index 78c51ab..85a2ea0 100644 --- a/Transceiver52M/ms/bladerf_specific.h +++ b/Transceiver52M/ms/bladerf_specific.h @@ -293,10 +293,10 @@ setRxGain(rxgain, 0); setTxGain(txgain, 0); usleep(1000); - blade_check(bladerf_enable_module, dev, BLADERF_MODULE_RX, true); - usleep(1000); - blade_check(bladerf_enable_module, dev, BLADERF_MODULE_TX, true); - usleep(1000); + + bladerf_set_stream_timeout(dev, BLADERF_TX, 10); + bladerf_set_stream_timeout(dev, BLADERF_RX, 10); + blade_check(bladerf_init_stream, &rx_stream, dev, getrxcb(rxh), &buf_mgmt.rx_samples, BLADE_NUM_BUFFERS, BLADERF_FORMAT_SC16_Q11_META, BLADE_BUFFER_SIZE, NUM_TRANSFERS, (void *)this); @@ -308,15 +308,16 @@ buf_mgmt.bufptrqueue.spsc_push(&cur_buffer[i]); } - - usleep(1000); - - // bladerf_set_stream_timeout(dev, BLADERF_TX, 4); - // bladerf_set_stream_timeout(dev, BLADERF_RX, 4); - return 0; } + void actually_enable_streams() + { + blade_check(bladerf_enable_module, dev, BLADERF_MODULE_RX, true); + usleep(1000); + blade_check(bladerf_enable_module, dev, BLADERF_MODULE_TX, true); + } + bool tuneTx(double freq, size_t chan = 0) { msleep(15); @@ -418,8 +419,9 @@ auto get_rx_burst_handler_fn(bh_fn_t burst_handler) { auto fn = [this] { - int status; - status = bladerf_stream(rx_stream, BLADERF_RX_X1); + int status = 0; + if (!stop_me_flag) + status = bladerf_stream(rx_stream, BLADERF_RX_X1); if (status < 0) std::cerr << "rx stream error! " << bladerf_strerror(status) << std::endl; @@ -430,8 +432,9 @@ auto get_tx_burst_handler_fn(bh_fn_t burst_handler) { auto fn = [this] { - int status; - status = bladerf_stream(tx_stream, BLADERF_TX_X1); + int status = 0; + if (!stop_me_flag) + status = bladerf_stream(tx_stream, BLADERF_TX_X1); if (status < 0) std::cerr << "rx stream error! " << bladerf_strerror(status) << std::endl; @@ -442,9 +445,15 @@ void submit_burst_ts(blade_sample_type *buffer, int len, uint64_t ts) { - //get empty bufer from list tx_buf_q_type::elem_t rcd; + // exit by submitting a dummy buffer to assure the libbladerf stream mutex is happy (thread!) + if (!buffer) { + bladerf_submit_stream_buffer(tx_stream, (void *)BLADERF_STREAM_SHUTDOWN, 1000); + return; + } + + //get empty bufer from list while (!buf_mgmt.bufptrqueue.spsc_pop(&rcd)) buf_mgmt.bufptrqueue.spsc_prep_pop(); assert(rcd != nullptr); diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index 1dc2587..f338225 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -276,6 +276,8 @@ void ms_trx::start() { + if (stop_me_flag) + return; auto fn = get_rx_burst_handler_fn(rx_bh()); rx_task = std::thread(fn); set_name_aff_sched(rx_task.native_handle(), sched_params::thread_names::RXRUN); @@ -285,6 +287,7 @@ tx_task = std::thread(fn2); set_name_aff_sched(tx_task.native_handle(), sched_params::thread_names::TXRUN); + actually_enable_streams(); } void ms_trx::set_upper_ready(bool is_ready) @@ -294,11 +297,14 @@ void ms_trx::stop_threads() { - std::cerr << "killing threads...\r\n" << std::endl; + std::cerr << "killing threads..." << std::endl; stop_me_flag = true; close_device(); + std::cerr << "dev closed..." << std::endl; rx_task.join(); + std::cerr << "L rx dead..." << std::endl; tx_task.join(); + std::cerr << "L tx dead..." << std::endl; } void ms_trx::submit_burst(blade_sample_type *buffer, int len, GSM::Time target) diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp index 3cb27e3..5b213f7 100644 --- a/Transceiver52M/ms/ms_upper.cpp +++ b/Transceiver52M/ms/ms_upper.cpp @@ -94,6 +94,17 @@ std::atomic<bool> g_exit_flag; +void upper_trx::stop_upper_threads() +{ + g_exit_flag = true; + + if (thr_control.joinable()) + thr_control.join(); + if (thr_rx.joinable()) + thr_rx.join(); + if (thr_tx.joinable()) + thr_tx.join(); +} void upper_trx::start_threads() { thr_control = std::thread([this] { @@ -101,6 +112,7 @@ while (!g_exit_flag) { driveControl(); } + std::cerr << "exit control!" << std::endl; }); msleep(1); thr_tx = std::thread([this] { @@ -108,6 +120,7 @@ while (!g_exit_flag) { driveTx(); } + std::cerr << "exit tx U!" << std::endl; }); // atomic ensures data is not written to q until loop reads @@ -115,7 +128,8 @@ set_name_aff_sched(sched_params::thread_names::U_RX); while (!g_exit_flag) { - // set_upper_ready(true); + // set_upper_ready(true) needs to happen during cmd handling: + // the main loop is driven by rx, so unless rx is on AND transceiver is on we get stuck.. driveReceiveFIFO(); trxcon::osmo_select_main(1); @@ -125,6 +139,9 @@ trxcon_phyif_handle_rsp(trxcon::g_trxcon, &r); } } + set_upper_ready(false); + std::cerr << "exit rx U!" << std::endl; + mOn = false; #ifdef LSANDEBUG std::thread([this] { @@ -267,8 +284,7 @@ // ensure our tx cb is tickled and can exit if (g_exit_flag) { - blade_sample_type dummy[10] = {}; - submit_burst_ts(dummy, 10, 1); + submit_burst_ts(0, 1337, 1); return; } @@ -360,10 +376,9 @@ set_ta(0); break; case trxcon::TRXCON_PHYIF_CMDT_POWERON: - if (!mOn) { - set_upper_ready(true); mOn = true; + set_upper_ready(true); } break; case trxcon::TRXCON_PHYIF_CMDT_POWEROFF: @@ -444,7 +459,7 @@ void sighandler(int sigset) { // we might get a sigpipe in case the l1ctl ud socket disconnects because mobile quits - if (sigset == SIGPIPE) { + if (sigset == SIGPIPE || sigset == SIGINT) { g_exit_flag = true; // we know the flag is atomic and it prevents the trxcon cb handlers from writing @@ -453,6 +468,7 @@ trxcon::internal_q_tx_buf b = {}; trxcon::txq.spsc_push(&b); trxcon::cmdq_to_phy.spsc_push(&cmd); + msleep(200); return; } @@ -462,6 +478,7 @@ { auto tall_trxcon_ctx = talloc_init("trxcon context"); signal(SIGPIPE, sighandler); + signal(SIGINT, sighandler); trxcon::msgb_talloc_ctx_init(tall_trxcon_ctx, 0); trxc_log_init(tall_trxcon_ctx); @@ -492,8 +509,11 @@ return -1; } + // blocking, will return when global exit is requested trx->start_threads(); + trx->stop_threads(); + trx->stop_upper_threads(); return status; } diff --git a/Transceiver52M/ms/ms_upper.h b/Transceiver52M/ms/ms_upper.h index 49516e6..fe20f6d 100644 --- a/Transceiver52M/ms/ms_upper.h +++ b/Transceiver52M/ms/ms_upper.h @@ -43,6 +43,7 @@ public: void start_threads(); void start_lower_ms(); + void stop_upper_threads(); upper_trx(){}; }; diff --git a/Transceiver52M/ms/uhd_specific.h b/Transceiver52M/ms/uhd_specific.h index 726bb95..07fc449 100644 --- a/Transceiver52M/ms/uhd_specific.h +++ b/Transceiver52M/ms/uhd_specific.h @@ -185,6 +185,11 @@ return 0; } + void actually_enable_streams() + { + // nop: stream cmd in handler + } + void *rx_cb(bh_fn_t burst_handler) { void *ret = nullptr; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1cd8790191790f4861a70bc55c8f4c9993fa10c8 Gerrit-Change-Number: 32944 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-trx[master]: ms: fix startup & shutdown of blade
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32944 ) Change subject: ms: fix startup & shutdown of blade ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1cd8790191790f4861a70bc55c8f4c9993fa10c8 Gerrit-Change-Number: 32944 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jul 2023 10:31:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-trx[master]: ms: prettify scheduling + add odroid
by Hoernchen 10 Jul '23

10 Jul '23

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32943 ) Change subject: ms: prettify scheduling + add odroid ...................................................................... ms: prettify scheduling + add odroid Change-Id: Icaf42fd5f76dc2d53dc526558aa8ceaa9c190f7b --- M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp 4 files changed, 70 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index d191ed5..1dc2587 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -278,12 +278,13 @@ { auto fn = get_rx_burst_handler_fn(rx_bh()); rx_task = std::thread(fn); - set_name_aff_sched(rx_task.native_handle(), "rxrun", 2, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 2); + set_name_aff_sched(rx_task.native_handle(), sched_params::thread_names::RXRUN); usleep(1000); auto fn2 = get_tx_burst_handler_fn(tx_bh()); tx_task = std::thread(fn2); - set_name_aff_sched(tx_task.native_handle(), "txrun", 2, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 1); + set_name_aff_sched(tx_task.native_handle(), sched_params::thread_names::TXRUN); + } void ms_trx::set_upper_ready(bool is_ready) diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index 8ea9932..dbf2e9a 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -200,6 +200,40 @@ } }; +static struct sched_params { + enum thread_names { U_CTL = 0, U_RX, U_TX, SCH_SEARCH, MAIN, LEAKCHECK, RXRUN, TXRUN, _THRD_NAME_COUNT }; + enum target { ODROID = 0, PI4 }; + const char *name; + int core; + int schedtype; + int prio; +} schdp[][sched_params::_THRD_NAME_COUNT]{ + { + { "upper_ctrl", 2, SCHED_RR, sched_get_priority_max(SCHED_RR) }, + { "upper_rx", 2, SCHED_RR, sched_get_priority_max(SCHED_RR) - 5 }, + { "upper_tx", 2, SCHED_RR, sched_get_priority_max(SCHED_RR) - 1 }, + + { "sch_search", 3, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 5 }, + { "main", 3, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 5 }, + { "leakcheck", 3, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 10 }, + + { "rxrun", 4, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 2 }, + { "txrun", 5, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 1 }, + }, + { + { "upper_ctrl", 1, SCHED_RR, sched_get_priority_max(SCHED_RR) }, + { "upper_rx", 1, SCHED_RR, sched_get_priority_max(SCHED_RR) - 5 }, + { "upper_tx", 1, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 1 }, + + { "sch_search", 1, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 5 }, + { "main", 3, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 5 }, + { "leakcheck", 1, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 10 }, + + { "rxrun", 2, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 2 }, + { "txrun", 3, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 1 }, + }, +}; + using ts_hitter_q_t = spsc_cond<64, GSM::Time, true, false>; struct ms_trx : public BASET { @@ -230,6 +264,8 @@ int64_t first_sch_ts_start = -1; time_keeper timekeeper; + int hw_cpus; + sched_params::target hw_target; void start(); std::atomic<bool> upper_is_ready; @@ -250,8 +286,11 @@ ms_trx() : timing_advance(0), do_auto_gain(false), rxqueue(), first_sch_buf(new blade_sample_type[SCH_LEN_SPS]), - burst_copy_buffer(new blade_sample_type[ONE_TS_BURST_LEN]), rcv_done{ false }, sch_thread_done{ false } + burst_copy_buffer(new blade_sample_type[ONE_TS_BURST_LEN]), rcv_done{ false }, + sch_thread_done{ false }, hw_cpus(std::thread::hardware_concurrency()), + hw_target(hw_cpus > 4 ? sched_params::target::ODROID : sched_params::target::PI4) { + std::cerr << "scheduling for: " << (hw_cpus > 4 ? "odroid" : "pi4") << std::endl; } virtual ~ms_trx() @@ -269,11 +308,19 @@ timing_advance = val * 4; } - void set_name_aff_sched(const char *name, int cpunum, int schedtype, int prio) + void set_name_aff_sched(sched_params::thread_names name) { - set_name_aff_sched(pthread_self(), name, cpunum, schedtype, prio); + set_name_aff_sched(pthread_self(), name); } + void set_name_aff_sched(std::thread::native_handle_type h, sched_params::thread_names name) + { + auto tgt = schdp[hw_target][name]; + // std::cerr << "scheduling for: " << tgt.name << ":" << tgt.core << std::endl; + set_name_aff_sched(h, tgt.name, tgt.core, tgt.schedtype, tgt.prio); + } + + private: void set_name_aff_sched(std::thread::native_handle_type h, const char *name, int cpunum, int schedtype, int prio) { @@ -284,16 +331,14 @@ CPU_ZERO(&cpuset); CPU_SET(cpunum, &cpuset); - auto rv = pthread_setaffinity_np(h, sizeof(cpuset), &cpuset); - if (rv < 0) { + if (pthread_setaffinity_np(h, sizeof(cpuset), &cpuset) < 0) { std::cerr << name << " affinity: errreur! " << std::strerror(errno); return exit(0); } sched_param sch_params; sch_params.sched_priority = prio; - rv = pthread_setschedparam(h, schedtype, &sch_params); - if (rv < 0) { + if (pthread_setschedparam(h, schedtype, &sch_params) < 0) { std::cerr << name << " sched: errreur! " << std::strerror(errno); return exit(0); } diff --git a/Transceiver52M/ms/ms_rx_lower.cpp b/Transceiver52M/ms/ms_rx_lower.cpp index e39d72d..e8d8e0e 100644 --- a/Transceiver52M/ms/ms_rx_lower.cpp +++ b/Transceiver52M/ms/ms_rx_lower.cpp @@ -235,7 +235,7 @@ sch_pos = 0; rcv_done = true; std::thread([this] { - set_name_aff_sched("sch_search", 1, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 5); + set_name_aff_sched(sched_params::thread_names::SCH_SEARCH); auto ptr = reinterpret_cast<const int16_t *>(first_sch_buf); const auto target_val = rxFullScale / 8; diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp index 63f5926..3cb27e3 100644 --- a/Transceiver52M/ms/ms_upper.cpp +++ b/Transceiver52M/ms/ms_upper.cpp @@ -97,14 +97,14 @@ void upper_trx::start_threads() { thr_control = std::thread([this] { - set_name_aff_sched("upper_ctrl", 1, SCHED_RR, sched_get_priority_max(SCHED_RR)); + set_name_aff_sched(sched_params::thread_names::U_CTL); while (!g_exit_flag) { driveControl(); } }); msleep(1); thr_tx = std::thread([this] { - set_name_aff_sched("upper_tx", 1, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 1); + set_name_aff_sched(sched_params::thread_names::U_TX); while (!g_exit_flag) { driveTx(); } @@ -113,7 +113,7 @@ // atomic ensures data is not written to q until loop reads start_lower_ms(); - set_name_aff_sched("upper_rx", 1, SCHED_FIFO, sched_get_priority_max(SCHED_RR) - 5); + set_name_aff_sched(sched_params::thread_names::U_RX); while (!g_exit_flag) { // set_upper_ready(true); driveReceiveFIFO(); @@ -128,7 +128,7 @@ #ifdef LSANDEBUG std::thread([this] { - set_name_aff_sched("leakcheck", 1, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 10); + set_name_aff_sched(sched_params::thread_names::LEAKCHECK); while (1) { std::this_thread::sleep_for(std::chrono::seconds{ 5 }); @@ -485,7 +485,7 @@ std::cerr << "Error initializing hardware, quitting.." << std::endl; return -1; } - trx->set_name_aff_sched("main", 3, SCHED_FIFO, sched_get_priority_max(SCHED_FIFO) - 5); + trx->set_name_aff_sched(sched_params::thread_names::MAIN); if (!trxcon::trxc_l1ctl_init(tall_trxcon_ctx)) { std::cerr << "Error initializing l1ctl, quitting.." << std::endl; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icaf42fd5f76dc2d53dc526558aa8ceaa9c190f7b Gerrit-Change-Number: 32943 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0