March 2025 - gerrit-log - lists.osmocom.org

[XS] Change in docker-playground[master]: ttcn3-bts-test: Run fake_trx with sched-prio-rr

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/39816?usp=email ) Change subject: ttcn3-bts-test: Run fake_trx with sched-prio-rr ...................................................................... ttcn3-bts-test: Run fake_trx with sched-prio-rr Change-Id: I8f9df66e0819881587b55c93043fed9a294ab5e8 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/16/39816/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index d4b59e7..7a8448a 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -60,6 +60,8 @@ echo Starting container with fake_trx docker run --rm \ $(docker_network_params $SUBNET 21) \ + --cap-add=SYS_ADMIN \ + --ulimit rtprio=99 \ --ulimit core=-1 \ -v $VOL_BASE_DIR/fake_trx:/data \ --name ${BUILD_TAG}-fake_trx -d \ @@ -70,6 +72,7 @@ --log-file-level DEBUG \ --log-file-time \ --log-level INFO \ + --sched-prio-rr 30 \ -R $SUB4_PREFIX.$SUBNET.20 \ -r $SUB4_PREFIX.$SUBNET.22 \ --trx TRX1@$SUB4_PREFIX.$SUBNET.20:5700/1 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39816?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8f9df66e0819881587b55c93043fed9a294ab5e8 Gerrit-Change-Number: 39816 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: fake_trx: Allow setting sched RR priority for clckgen thread

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39815?usp=email ) Change subject: fake_trx: Allow setting sched RR priority for clckgen thread ...................................................................... fake_trx: Allow setting sched RR priority for clckgen thread Change-Id: I3c7f36c17fc7b9cae1023b4a0ed37f983dc286dc --- M src/target/trx_toolkit/clck_gen.py M src/target/trx_toolkit/fake_trx.py 2 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/39815/1 diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index c6da8f6..e9dc3ea 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -24,6 +24,7 @@ import threading import time import signal +import os from app_common import ApplicationBase from udp_link import UDPLink @@ -34,7 +35,7 @@ SEC_DELAY_US = 1000 * 1000 GSM_FRAME_US = 4615.0 - def __init__(self, clck_links, clck_start = 0, ind_period = 102): + def __init__(self, clck_links, clck_start = 0, ind_period = 102, sched_prio_rr = None): # This event is needed to control the thread self._breaker = threading.Event() self._thread = None @@ -50,6 +51,9 @@ # (Optional) clock consumer self.clck_handler = None + # RR Scheduler priority of thread. None = don't set it. + self.sched_prio_rr = sched_prio_rr + @property def running(self): if self._thread is None: @@ -66,6 +70,7 @@ # Initialize and start a new thread self._thread = threading.Thread(target = self._worker) self._thread.daemon = True + self._thread.sched_prio_rr = self.sched_prio_rr self._thread.start() def stop(self): @@ -83,6 +88,13 @@ self._breaker.clear() def _worker(self): + if self.sched_prio_rr is not None: + sched_param = os.sched_param(self.sched_prio_rr) + try: + log.info("Setting real time process scheduler to SCHED_RR, priority %u" % (self.sched_prio_rr)) + os.sched_setscheduler(0, os.SCHED_RR, sched_param) + except OSError: + log.error("Failed to set real time process scheduler to SCHED_RR, priority %u" % (self.sched_prio_rr)) # run .send_clck_ind() every .ctr_interval # be careful not to accumulate timing error when organizing the clock loop ns = 1e-9 diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index 21bd189..033baec 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -397,7 +397,7 @@ self.trx_list = TRXList() # Init shared clock generator - self.clck_gen = CLCKGen([]) + self.clck_gen = CLCKGen([], sched_prio_rr = self.argv.sched_prio_rr) # This method will be called on each TDMA frame self.clck_gen.clck_handler = self.clck_handler @@ -530,6 +530,9 @@ trx_group.add_argument("-p", "--bb-base-port", dest = "bb_base_port", type = int, default = 6700, help = "Set BB base port number (default %(default)s)") + trx_group.add_argument("-s", "--sched-prio-rr", + dest = "sched_prio_rr", type = int, default = None, + help = "Set Scheduler RR Priority (default None)") mtrx_group = parser.add_argument_group("Additional transceivers") mtrx_group.add_argument("--trx", -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3c7f36c17fc7b9cae1023b4a0ed37f983dc286dc Gerrit-Change-Number: 39815 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-hlr[master]: db: flush after changing schema version

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39804?usp=email ) Change subject: db: flush after changing schema version ...................................................................... db: flush after changing schema version Flush the cache after changing the version, to make the scenario less likely that after an unclean shutdown the DB gets restored with the right table layout but wrong version. When that happens, osmo-hlr tries to upgrade the database layout again and fails with errors like "duplicate column name". Related: SYS#7394 Change-Id: I5943a1cb3447c038c6e7972f68f9656b73a9248b --- M src/db.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/db.c b/src/db.c index 7b8a415..4ce5aa0 100644 --- a/src/db.c +++ b/src/db.c @@ -595,6 +595,7 @@ int rc; bool has_sqlite_config_sqllog = false; int version; + bool version_changed = false; LOGP(DDB, LOGL_NOTICE, "using database: %s\n", fname); LOGP(DDB, LOGL_INFO, "Compiled against SQLite3 lib version %s\n", SQLITE_VERSION); @@ -672,6 +673,7 @@ goto out_free; } version = CURRENT_SCHEMA_VERSION; + version_changed = true; } LOGP(DDB, LOGL_NOTICE, "Database '%s' has HLR DB schema version %d\n", dbc->fname, version); @@ -686,6 +688,7 @@ } LOGP(DDB, LOGL_NOTICE, "Database '%s' has been upgraded to HLR DB schema version %d\n", dbc->fname, version+1); + version_changed = true; } if (version != CURRENT_SCHEMA_VERSION) { @@ -702,6 +705,12 @@ goto out_free; } + /* Flush the cache after changing the version, to make the scenario + * less likely that after an unclean shutdown the DB gets restored + * with the right table layout but wrong version (SYS#7394). */ + if (version_changed) + sqlite3_db_cacheflush(dbc->db); + /* prepare all SQL statements */ for (i = 0; i < ARRAY_SIZE(dbc->stmt); i++) { rc = sqlite3_prepare_v2(dbc->db, stmt_sql[i], -1, -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5943a1cb3447c038c6e7972f68f9656b73a9248b Gerrit-Change-Number: 39804 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmo-hlr[master]: db: flush after changing schema version

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39804?usp=email ) Change subject: db: flush after changing schema version ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5943a1cb3447c038c6e7972f68f9656b73a9248b Gerrit-Change-Number: 39804 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Mar 2025 08:47:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[XS] Change in osmocom-bb[master]: trx_toolkit: implement sending of NOPE.ind

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39813?usp=email ) Change subject: trx_toolkit: implement sending of NOPE.ind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39813?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1e1a5209a9acff6c747cb4c574e9118bc8268474 Gerrit-Change-Number: 39813 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 20:49:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[XS] Change in osmocom-bb[master]: Revert "trxcon/trx_if: send NOPE indications if there is no burst"

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39814?usp=email ) Change subject: Revert "trxcon/trx_if: send NOPE indications if there is no burst" ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/host/trxcon/src/trx_if.c: https://gerrit.osmocom.org/c/osmocom-bb/+/39814/comment/ccdee3f9_4d966d51?u… : PS1, Line 724: if (br->burst_len == 0) A comment here describing that this is NOPE.ind may be really interesting. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic3c55511cfee911d4eaea0ab19ee6295c9ac28cc Gerrit-Change-Number: 39814 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 20:47:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

3 months, 3 weeks

1
0
0 0

[XS] Change in osmocom-bb[master]: Revert "trxcon/trx_if: send NOPE indications if there is no burst"

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39814?usp=email ) Change subject: Revert "trxcon/trx_if: send NOPE indications if there is no burst" ...................................................................... Revert "trxcon/trx_if: send NOPE indications if there is no burst" This reverts commit f8bc28505f60e2a5636ad7779a13374ed661ad14. Sending NOPE.ind from trxcon is no longer needed, since fake_trx.py can now generate them on its own (see the related commit). Change-Id: Ic3c55511cfee911d4eaea0ab19ee6295c9ac28cc Related: I1e1a5209a9acff6c747cb4c574e9118bc8268474 --- M src/host/trxcon/src/trx_if.c 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/39814/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index fad1026..e23b71a 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -721,6 +721,9 @@ uint8_t buf[TRXD_BUF_SIZE]; size_t length; + if (br->burst_len == 0) + return 0; + /** * We must be sure that we have clock, * and we have sent all control data @@ -746,10 +749,8 @@ length = 6; /* Copy ubits {0,1} */ - if (br->burst_len != 0) { - memcpy(buf + 6, br->burst, br->burst_len); - length += br->burst_len; - } + memcpy(buf + 6, br->burst, br->burst_len); + length += br->burst_len; /* Send data to transceiver */ send(trx->trx_ofd_data.fd, buf, length, 0); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic3c55511cfee911d4eaea0ab19ee6295c9ac28cc Gerrit-Change-Number: 39814 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[XS] Change in osmocom-bb[master]: trx_toolkit: implement sending of NOPE.ind

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39813?usp=email ) Change subject: trx_toolkit: implement sending of NOPE.ind ...................................................................... trx_toolkit: implement sending of NOPE.ind Now that we have the transmit burst queue properly working, we can finally emit NOPE.ind from fake_trx.py. There's no more need to rely on trxcon sending NOPE.ind, so the respective logic will be reverted in a follow-up patch. Change-Id: I1e1a5209a9acff6c747cb4c574e9118bc8268474 --- M src/target/trx_toolkit/transceiver.py 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/13/39813/1 diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index ce71bb1..a5298b4 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -23,6 +23,7 @@ from ctrl_if_trx import CTRLInterfaceTRX from data_if import DATAInterface +from data_msg import TxMsg from udp_link import UDPLink from trx_list import TRXList @@ -308,8 +309,11 @@ if not self.running: return + # list of PDUs to be dropped drop = [] - emit = [] + # list of PDUs to be emitted (all NOPE.ind by default) + emit = [TxMsg(fn, tn) for tn in range(8)] + # list of PDUs to be kept in the Tx queue wait = [] with self._tx_queue_lock: @@ -317,7 +321,7 @@ if msg.fn < fn: drop.append(msg) elif msg.fn == fn: - emit.append(msg) + emit[msg.tn] = msg else: wait.append(msg) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39813?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1e1a5209a9acff6c747cb4c574e9118bc8268474 Gerrit-Change-Number: 39813 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[XS] Change in libosmo-abis[master]: examples/lapd-over-datagram: Use newer non-deprecated API lapd_instan...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39805?usp=email ) Change subject: examples/lapd-over-datagram: Use newer non-deprecated API lapd_instance_alloc2() ...................................................................... examples/lapd-over-datagram: Use newer non-deprecated API lapd_instance_alloc2() libosmocore API lapd_instance_alloc() has been deprecated for a while now. Change-Id: I548343db3bf5d2375ed1c77f3d0474a2d0c80476 --- M doc/examples/lapd-over-datagram/lapd-over-datagram-network.c M doc/examples/lapd-over-datagram/lapd-over-datagram-user.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/examples/lapd-over-datagram/lapd-over-datagram-network.c b/doc/examples/lapd-over-datagram/lapd-over-datagram-network.c index 8915e81..eecba8e 100644 --- a/doc/examples/lapd-over-datagram/lapd-over-datagram-network.c +++ b/doc/examples/lapd-over-datagram/lapd-over-datagram-network.c @@ -151,8 +151,8 @@ osmo_dgram_set_remote_port(conn, 10000); osmo_dgram_set_read_cb(conn, read_cb); - lapd = lapd_instance_alloc(1, lapd_tx_cb, conn, lapd_rx_cb, conn, - &lapd_profile_sat); + lapd = lapd_instance_alloc2(1, lapd_tx_cb, conn, lapd_rx_cb, conn, + &lapd_profile_sat, "lapd_test"); if (lapd == NULL) { LOGP(DLAPDTEST, LOGL_ERROR, "cannot allocate instance\n"); exit(EXIT_FAILURE); diff --git a/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c b/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c index c988b22..5eb58e8 100644 --- a/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c +++ b/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c @@ -201,8 +201,8 @@ * initialize LAPD stuff. */ - lapd = lapd_instance_alloc(0, lapd_tx_cb, NULL, lapd_rx_cb, &num_msgs, - &lapd_profile_sat); + lapd = lapd_instance_alloc2(0, lapd_tx_cb, NULL, lapd_rx_cb, &num_msgs, + &lapd_profile_sat, "lapd_test"); if (lapd == NULL) { LOGP(DLINP, LOGL_ERROR, "cannot allocate instance\n"); exit(EXIT_FAILURE); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39805?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I548343db3bf5d2375ed1c77f3d0474a2d0c80476 Gerrit-Change-Number: 39805 Gerrit-PatchSet: 2 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-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

[XS] Change in libosmocore[master]: lapdm: Move queue initialization to specific init function

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39812?usp=email ) Change subject: lapdm: Move queue initialization to specific init function ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/39812/comment/8cba746e_082d0e85?… : PS1, Line 9: Otherwise the msg talloc reference is kept parented at some unknown : pointer in some unknown upper layer, which may cause memory corruption : or > This does not belong here. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9c73f3aa5cc39d298296a82a99fbaf234b0ebe99 Gerrit-Change-Number: 39812 Gerrit-PatchSet: 2 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 18:14:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025