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

[S] Change in osmo-trx[master]: ms: bump osmocom-bb submodule to current head

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34262 ) Change subject: ms: bump osmocom-bb submodule to current head ...................................................................... ms: bump osmocom-bb submodule to current head Change-Id: I9a16de0dce2e89fb522271ba63d908e33a1d7cde --- M osmocom-bb 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved diff --git a/osmocom-bb b/osmocom-bb index fb38499..096a3cc 160000 --- a/osmocom-bb +++ b/osmocom-bb @@ -1 +1 @@ -Subproject commit fb384998fbddcc545eec76da41db1aa41b583aa9 +Subproject commit 096a3cc6f3e982df09836b70a5adcd57a4b93ab9 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9a16de0dce2e89fb522271ba63d908e33a1d7cde Gerrit-Change-Number: 34262 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: bump osmocom-bb submodule to current head

by Hoernchen

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34262 ) Change subject: ms: bump osmocom-bb submodule to current head ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9a16de0dce2e89fb522271ba63d908e33a1d7cde Gerrit-Change-Number: 34262 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 31 Aug 2023 15:53:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 ) Change subject: ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction ...................................................................... ipa: use LSBs of file descriptor as SLS in IPA->M3UA direction when IPA/SCCPlite traffic traverses the osmo_ss7 stack, so far the SLS of the MTP3 label was always set to 0 (default initialization). However, in order to achieve a better distribution of signaling traffic in SS7 networks that actually utilize the SLS to select any links (or ASPs), it makes sense to use non-zero values. Instead of introducing some kind of new, configurable attribute for each ASP (IPA client connection), let's simply use the lower 4 bits of the file descriptor integer. Those file descriptors should have a roughly equal distribution, resulting in traffic (from multiple IPA clients) to be spread across the 4-bit SLS number space. Also, this mechanism ensures that traffic from one IPA client will always get the same SLS and hence routed the same way in any underlying CS7/SS7 network. Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Related: SYS#6543 --- M src/ipa.c M src/osmo_ss7.c M src/xua_internal.h 3 files changed, 34 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/34264/1 diff --git a/src/ipa.c b/src/ipa.c index 8daa5e0..874879e 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -211,7 +211,7 @@ return sccp_msg_out; } -static int ipa_rx_msg_sccp(struct osmo_ss7_asp *asp, struct msgb *msg) +static int ipa_rx_msg_sccp(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls) { int rc; struct m3ua_data_hdr data_hdr; @@ -276,6 +276,7 @@ data_hdr.si = MTP_SI_SCCP; data_hdr.opc = osmo_htonl(opc); data_hdr.dpc = osmo_htonl(dpc); + data_hdr.sls = sls; data_hdr.ni = as->inst->cfg.network_indicator; /* Create M3UA message in XUA structure */ xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); @@ -293,7 +294,7 @@ * \param[in] asp Application Server Process receiving \a msg * \param[in] msg received message buffer. Callee takes ownership! * \returns 0 on success; negative on error */ -int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg) +int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls) { struct ipaccess_head *hh; int rc; @@ -309,7 +310,7 @@ rc = ipa_rx_msg_ccm(asp, msg); break; case IPAC_PROTO_SCCP: - rc = ipa_rx_msg_sccp(asp, msg); + rc = ipa_rx_msg_sccp(asp, msg, sls); break; default: rc = ss7_asp_rx_unknown(asp, hh->proto, msg); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index b8124d1..440014a 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -2046,7 +2046,7 @@ } msg->dst = asp; - return ipa_rx_msg(asp, msg); + return ipa_rx_msg(asp, msg, ofd->fd & 0xf); } /* netif code tells us we can read something from the socket */ @@ -2194,7 +2194,7 @@ } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg); + return ipa_rx_msg(asp, msg, ofd->fd & 0xf); } static int xua_cli_read_cb(struct osmo_stream_cli *conn) diff --git a/src/xua_internal.h b/src/xua_internal.h index 26cb3fc..93f6140 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -116,7 +116,7 @@ const struct xua_msg_part *rctx_ie); int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); -int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); +int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls); int osmo_isup_party_parse(char *out_digits, const uint8_t *in, unsigned int in_num_bytes, bool odd); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 Gerrit-Change-Number: 34264 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Don't expect a fixed SLS in IPA -> M3UA case

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263 ) Change subject: stp: Don't expect a fixed SLS in IPA -> M3UA case ...................................................................... stp: Don't expect a fixed SLS in IPA -> M3UA case We are about to introduce a feature for SLS "randomization" in osmo-stp, so let's modifiy our STP tests to permit any SLS in the M3UA messages after IPA -> M3UA conversion. Change-Id: Ib70322b80a72e3e7dc3155bca9e67b03efb413e0 Related: SYS#6543 --- M stp/STP_Tests.ttcn 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/34263/1 diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 48214be..e2e5336 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -114,7 +114,7 @@ /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; - rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc); + rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, sccp_enc); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); @@ -148,7 +148,7 @@ /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, c_M3UA_NI_NATIONAL, - '00'O, '00'O, sccp_enc); + '00'O, ?, sccp_enc); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international"); f_clear_m3ua(); @@ -185,7 +185,7 @@ /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; - rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, + rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, enc_PDU_SCCP(sccp_exp)); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib70322b80a72e3e7dc3155bca9e67b03efb413e0 Gerrit-Change-Number: 34263 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: bump osmocom-bb submodule to current head

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/34262 ) Change subject: ms: bump osmocom-bb submodule to current head ...................................................................... ms: bump osmocom-bb submodule to current head Change-Id: I9a16de0dce2e89fb522271ba63d908e33a1d7cde --- M osmocom-bb 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/34262/1 diff --git a/osmocom-bb b/osmocom-bb index fb38499..096a3cc 160000 --- a/osmocom-bb +++ b/osmocom-bb @@ -1 +1 @@ -Subproject commit fb384998fbddcc545eec76da41db1aa41b583aa9 +Subproject commit 096a3cc6f3e982df09836b70a5adcd57a4b93ab9 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9a16de0dce2e89fb522271ba63d908e33a1d7cde Gerrit-Change-Number: 34262 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: fix a few coverity complaints related to initialization

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34251 ) Change subject: ms: fix a few coverity complaints related to initialization ...................................................................... ms: fix a few coverity complaints related to initialization Change-Id: I203f4da7a4418fc5053d26901bec649d04fad096 --- M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_upper.h M Transceiver52M/ms/threadpool.h 3 files changed, 18 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index e6dbe4e..4d0f0cd 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -50,7 +50,7 @@ template <typename T> void clamp_array(T *start2, unsigned int len, T max) { - for (int i = 0; i < len; i++) { + for (unsigned int i = 0; i < len; i++) { const T t1 = start2[i] < -max ? -max : start2[i]; const T t2 = t1 > max ? max : t1; start2[i] = t2; @@ -263,7 +263,6 @@ std::thread lower_rx_task; std::thread lower_tx_task; - std::thread *calcrval_task; // provides bursts to upper rx thread rx_queue_t rxqueue; @@ -300,10 +299,12 @@ void maybe_update_gain(one_burst &brst); 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 }, hw_cpus(std::thread::hardware_concurrency()), - hw_target(hw_cpus > 4 ? sched_params::target::ODROID : sched_params::target::PI4) + : mTSC(0), mBSIC(0), 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]), first_sch_buf_rcv_ts(0), + 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), + upper_is_ready(false) { 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); diff --git a/Transceiver52M/ms/ms_upper.h b/Transceiver52M/ms/ms_upper.h index 0c430de..06f7c54 100644 --- a/Transceiver52M/ms/ms_upper.h +++ b/Transceiver52M/ms/ms_upper.h @@ -44,5 +44,5 @@ void driveReceiveFIFO(); void driveTx(); - upper_trx(){}; + upper_trx() : mOn(false){}; }; diff --git a/Transceiver52M/ms/threadpool.h b/Transceiver52M/ms/threadpool.h index a5dec97..2180c68 100644 --- a/Transceiver52M/ms/threadpool.h +++ b/Transceiver52M/ms/threadpool.h @@ -45,7 +45,7 @@ return; } - single_thread_pool() : worker_thread(std::thread([this] { thread_loop(); })) + single_thread_pool() : stop_flag(false), is_ready(false), worker_thread(std::thread([this] { thread_loop(); })) { } ~single_thread_pool() -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I203f4da7a4418fc5053d26901bec649d04fad096 Gerrit-Change-Number: 34251 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34250 ) Change subject: ms: fix thread prio startup issue ...................................................................... ms: fix thread prio startup issue This fixes the 20 second startup delay caused by tx/control threads getting temporarily stuck while trying to set their own priority. Apparently the only sane way for core affinity+priority is to set both as attributes during thread creation using pthreads. This switches the cmd queue to the timeout version, too, to ensure the thread doesn't get stuck waiting for messages, and allows cleaner exits. Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b --- M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_trxcon_if.h M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h M osmocom-bb 5 files changed, 111 insertions(+), 31 deletions(-) Approvals: Jenkins Builder: Verified pespin: 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 1c210b0..e6dbe4e 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -336,6 +336,15 @@ set_name_aff_sched(h, tgt.name, tgt.core, tgt.schedtype, tgt.prio); } + using pt_sig = void *(*)(void *); + + pthread_t spawn_worker_thread(sched_params::thread_names name, pt_sig fun, void *arg) + { + auto tgt = schdp[hw_target][name]; + // std::cerr << "scheduling for: " << tgt.name << ":" << tgt.core << " prio:" << tgt.prio << std::endl; + return do_spawn_thr(tgt.name, tgt.core, tgt.schedtype, tgt.prio, fun, arg); + } + private: void set_name_aff_sched(std::thread::native_handle_type h, const char *name, int cpunum, int schedtype, int prio) @@ -359,4 +368,28 @@ return exit(0); } } + + pthread_t do_spawn_thr(const char *name, int cpunum, int schedtype, int prio, pt_sig fun, void *arg) + { + pthread_t thread; + + pthread_attr_t attr; + pthread_attr_init(&attr); + + sched_param sch_params; + sch_params.sched_priority = prio; + cpu_set_t cpuset; + CPU_ZERO(&cpuset); + CPU_SET(cpunum, &cpuset); + auto a = pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &cpuset); + a |= pthread_attr_setschedpolicy(&attr, schedtype); + a |= pthread_attr_setschedparam(&attr, &sch_params); + a |= pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); + if(a) + std::cerr << "thread arg rc:" << a << std::endl; + pthread_create(&thread, &attr, fun, arg); + pthread_setname_np(thread, name); + pthread_attr_destroy(&attr); + return thread; + } }; diff --git a/Transceiver52M/ms/ms_trxcon_if.h b/Transceiver52M/ms/ms_trxcon_if.h index 9879d1a..0928d40 100644 --- a/Transceiver52M/ms/ms_trxcon_if.h +++ b/Transceiver52M/ms/ms_trxcon_if.h @@ -38,5 +38,5 @@ } }; using tx_queue_t = spsc_cond<8 * 1, internal_q_tx_buf, true, false>; -using cmd_queue_t = spsc_cond<8 * 1, trxcon_phyif_cmd, true, false>; +using cmd_queue_t = spsc_cond_timeout<8 * 1, trxcon_phyif_cmd, true, false>; using cmdr_queue_t = spsc_cond<8 * 1, trxcon_phyif_rsp, false, false>; diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp index 3c34efe..b161f4a 100644 --- a/Transceiver52M/ms/ms_upper.cpp +++ b/Transceiver52M/ms/ms_upper.cpp @@ -27,6 +27,8 @@ #include <radioInterface.h> #include <grgsm_vitac/grgsm_vitac.h> +// #define TXDEBUG + extern "C" { #include "sch.h" @@ -66,29 +68,54 @@ { 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(); + pthread_join(thr_control, NULL); + pthread_join(thr_tx, NULL); } + void upper_trx::start_threads() { - thr_control = std::thread([this] { - set_name_aff_sched(sched_params::thread_names::U_CTL); - while (!g_exit_flag) { - driveControl(); - } - std::cerr << "exit U control!" << std::endl; - }); - thr_tx = std::thread([this] { - set_name_aff_sched(sched_params::thread_names::U_TX); - while (!g_exit_flag) { - driveTx(); - } - std::cerr << "exit U tx!" << std::endl; - }); + DBGLG(...) << "spawning threads.." << std::endl; + + thr_control = spawn_worker_thread( + sched_params::thread_names::U_CTL, + [](void *args) -> void * { + upper_trx *t = reinterpret_cast<upper_trx *>(args); +#ifdef TXDEBUG + struct sched_param param; + int policy; + pthread_getschedparam(pthread_self(), &policy, &param); + printf("ID: %lu, CPU: %d policy = %d priority = %d\n", pthread_self(), sched_getcpu(), policy, + param.sched_priority); +#endif + std::cerr << "started U control!" << std::endl; + while (!g_exit_flag) { + t->driveControl(); + } + std::cerr << "exit U control!" << std::endl; + + return 0; + }, + this); + thr_tx = spawn_worker_thread( + sched_params::thread_names::U_TX, + [](void *args) -> void * { + upper_trx *t = reinterpret_cast<upper_trx *>(args); +#ifdef TXDEBUG + struct sched_param param; + int policy; + pthread_getschedparam(pthread_self(), &policy, &param); + printf("ID: %lu, CPU: %d policy = %d priority = %d\n", pthread_self(), sched_getcpu(), policy, + param.sched_priority); +#endif + std::cerr << "started U tx!" << std::endl; + while (!g_exit_flag) { + t->driveTx(); + } + std::cerr << "exit U tx!" << std::endl; + + return 0; + }, + this); #ifdef LSANDEBUG std::thread([this] { @@ -251,7 +278,7 @@ internal_q_tx_buf *burst = &e; -#ifdef TXDEBUG +#ifdef TXDEBUG2 DBGLG() << "got burst!" << burst->r.fn << ":" << burst->ts << " current: " << timekeeper.gsmtime().FN() << " dff: " << (int64_t)((int64_t)timekeeper.gsmtime().FN() - (int64_t)burst->r.fn) << std::endl; #endif @@ -270,7 +297,7 @@ // float -> int16 blade_sample_type burst_buf[txburst->size()]; convert_and_scale(burst_buf, txburst->begin(), txburst->size() * 2, 1); -#ifdef TXDEBUG +#ifdef TXDEBUG2 auto check = signalVector(txburst->size(), 40); convert_and_scale(check.begin(), burst_buf, txburst->size() * 2, 1); estim_burst_params ebp; @@ -313,7 +340,7 @@ static void print_cmd(trxcon_phyif_cmd_type c) { - DBGLG() << cmd2str(c) << std::endl; + DBGLG() << "handling " << cmd2str(c) << std::endl; } #endif @@ -323,6 +350,8 @@ trxcon_phyif_cmd cmd; while (!cmdq_to_phy.spsc_pop(&cmd)) { cmdq_to_phy.spsc_prep_pop(); + if (g_exit_flag) + return false; } if (g_exit_flag) diff --git a/Transceiver52M/ms/ms_upper.h b/Transceiver52M/ms/ms_upper.h index 2362365..0c430de 100644 --- a/Transceiver52M/ms/ms_upper.h +++ b/Transceiver52M/ms/ms_upper.h @@ -27,22 +27,22 @@ #include "ms.h" class upper_trx : public ms_trx { - bool mOn; + volatile bool mOn; char demodded_softbits[444]; // void driveControl(); - bool driveControl(); - void driveReceiveFIFO(); - void driveTx(); - bool pullRadioVector(GSM::Time &wTime, int &RSSI, int &timingOffset); - std::thread thr_control, thr_rx, thr_tx; + pthread_t thr_control, thr_tx; public: void start_threads(); void main_loop(); void stop_upper_threads(); + bool driveControl(); + void driveReceiveFIFO(); + void driveTx(); + upper_trx(){}; }; diff --git a/osmocom-bb b/osmocom-bb index 3f409eb..fb38499 160000 --- a/osmocom-bb +++ b/osmocom-bb @@ -1 +1 @@ -Subproject commit 3f409eb94eac9ffa67a7528f29f58275f0b836b8 +Subproject commit fb384998fbddcc545eec76da41db1aa41b583aa9 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-trx[master]: ms: fix thread prio startup issue

by Hoernchen

Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34250 ) Change subject: ms: fix thread prio startup issue ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b Gerrit-Change-Number: 34250 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 15:18:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34059 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 5: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/34059/comment/f823304c_8e9ec908 PS4, Line 14: CAUTION: This patch breaks compatibility to current master osmo-pcu (See : also "Depends") > What do you think? Shall we bump the version to v.12 here now (osmo-ttcn3-hacks would require a follow up patch) Ideally, yes. But there have already been some turbulence within PCUIFv11, so I guess it's too late and bumping the version [again] would create even more turbulence/confusion. > [...] in the future apply the policy that the version number must be bumped as soon as a detail in PCUIF changes I believe this policy is not new and was followed before PCUIFv11. But yes, we should definitely stick to this policy. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Gerrit-Change-Number: 34059 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 15:05:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix several template type incongruencies

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 ) Change subject: GTP_Templates: Fix several template type incongruencies ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3846d2a077e4bc53a772e354fcc3c38ca952b38f Gerrit-Change-Number: 34261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 14:40:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023