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

[M] Change in osmo-bts[master]: bts-trx: get rid of static variables in trx_if_send_burst()
by fixeria 11 Dec '25

11 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41658?usp=email ) Change subject: bts-trx: get rid of static variables in trx_if_send_burst() ...................................................................... bts-trx: get rid of static variables in trx_if_send_burst() Change-Id: I431964d6fe02e53771cc0514ac930348f0a86aa1 Related: OS#1579 --- M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/trx_if.c 2 files changed, 28 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/58/41658/1 diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 7cc82ad..0180499 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -126,6 +126,13 @@ /* Whether the l1h->trx_ctrl_list was flushed by the callback handling a received message */ bool flushed_while_in_trx_ctrl_read_cb; + struct { + /* the Tx buffer used by trx_if_send_burst() */ + struct msgb *sndbuf; + /* number of PDUs in the Tx buffer */ + unsigned int sndbuf_num_pdus; + } data; + //struct gsm_bts_trx *trx; struct phy_instance *phy_inst; diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index a76e9eb..510bf4a 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -1110,9 +1110,8 @@ int trx_if_send_burst(struct trx_l1h *l1h, const struct trx_dl_burst_req *br) { uint8_t pdu_ver = l1h->config.trxd_pdu_ver_use; - static struct msgb *trx_data_last_msg = NULL; - static unsigned int pdu_num = 0; - uint8_t *buf; + struct msgb *sndbuf = NULL; + uint8_t *buf = NULL; int rc; /* Make sure that the PHY is powered on */ @@ -1122,33 +1121,33 @@ return -ENODEV; } - if (!trx_data_last_msg) { - trx_data_last_msg = msgb_alloc(TRXD_MSG_BUF_SIZE, "tx_trxd"); - OSMO_ASSERT(trx_data_last_msg); - buf = msgb_data(trx_data_last_msg); + if (l1h->data.sndbuf == NULL) { + l1h->data.sndbuf = msgb_alloc_c(l1h, TRXD_MSG_BUF_SIZE, "tx_trxd"); + OSMO_ASSERT(l1h->data.sndbuf); } + sndbuf = l1h->data.sndbuf; /* Burst batching breaker */ if (br == NULL) { - if (pdu_num > 0) + if (l1h->data.sndbuf_num_pdus > 0) goto sendall; return -ENOMSG; } - /* l2h holds Pointer to the last encoded PDU */ - trx_data_last_msg->l2h = trx_data_last_msg->tail; + /* l2h points to the last encoded PDU */ + sndbuf->l2h = sndbuf->tail; switch (pdu_ver) { /* Both versions have the same PDU format */ case 0: /* TRXDv0 */ case 1: /* TRXDv1 */ - buf = (uint8_t *)msgb_put(trx_data_last_msg, 6); + buf = (uint8_t *)msgb_put(sndbuf, 6); buf[0] = ((pdu_ver & 0x0f) << 4) | br->tn; osmo_store32be(br->fn, buf + 1); buf[5] = br->att; break; case 2: /* TRXDv2 */ - buf = (uint8_t *)msgb_put(trx_data_last_msg, 8); + buf = (uint8_t *)msgb_put(sndbuf, 8); buf[0] = br->tn; /* BATCH.ind will be unset in the last PDU */ buf[1] = (br->trx_num & 0x3f) | (1 << 7); @@ -1159,9 +1158,9 @@ buf[4] = (uint8_t) br->scpir; buf[5] = buf[6] = buf[7] = 0x00; /* Spare */ /* Some fields are not present in batched PDUs */ - if (pdu_num == 0) { + if (l1h->data.sndbuf_num_pdus == 0) { buf[0] |= (pdu_ver & 0x0f) << 4; - osmo_store32be(br->fn, (uint8_t *)msgb_put(trx_data_last_msg, 4)); + msgb_put_u32(sndbuf, br->fn); } break; default: @@ -1170,10 +1169,10 @@ } /* copy ubits {0,1} */ - memcpy(msgb_put(trx_data_last_msg, br->burst_len), br->burst, br->burst_len); + memcpy(msgb_put(sndbuf, br->burst_len), br->burst, br->burst_len); /* One more PDU in the buffer */ - pdu_num++; + l1h->data.sndbuf_num_pdus++; /* TRXDv2: wait for the batching breaker */ if (pdu_ver >= 2) @@ -1182,23 +1181,23 @@ sendall: LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, "Tx TRXDv%u datagram with %u PDU(s)\n", - pdu_ver, pdu_num); + pdu_ver, l1h->data.sndbuf_num_pdus); /* TRXDv2: unset BATCH.ind in the last PDU */ if (pdu_ver >= 2) - trx_data_last_msg->l2h[1] &= ~(1 << 7); + sndbuf->l2h[1] &= ~(1 << 7); - rc = osmo_iofd_write_msgb(l1h->trx_data_iofd, trx_data_last_msg); + rc = osmo_iofd_write_msgb(l1h->trx_data_iofd, sndbuf); if (OSMO_UNLIKELY(rc < 0)) { char errbuf[256]; strerror_r(errno, errbuf, sizeof(errbuf)); LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "send() failed on TRXD with rc=%d (%s)\n", rc, errbuf); - msgb_free(trx_data_last_msg); + msgb_free(sndbuf); } - trx_data_last_msg = NULL; - pdu_num = 0; + l1h->data.sndbuf = NULL; + l1h->data.sndbuf_num_pdus = 0; return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41658?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I431964d6fe02e53771cc0514ac930348f0a86aa1 Gerrit-Change-Number: 41658 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[ttcn3-bts-test]: trx_toolkit: print milliseconds in logging
by fixeria 11 Dec '25

11 Dec '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41653?usp=email ) Change subject: trx_toolkit: print milliseconds in logging ...................................................................... trx_toolkit: print milliseconds in logging More preciese timestamps are helpful during debugging. Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Related: OS#6904 (cherry picked from commit 8900f2ef21976c561cd78427c61cd48fac0a108a) --- M src/target/trx_toolkit/app_common.py 1 file changed, 1 insertion(+), 1 deletion(-) Objections: Jenkins Builder: Fails diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index 531d8dc..75dd5a2 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -39,7 +39,7 @@ "There is NO WARRANTY, to the extent permitted by law.\n") def add_log_handler(self, lh, log_level, log_fmt, time_fmt, log_time = False): - log_fmt = "%(asctime)s " + log_fmt if log_time else log_fmt + log_fmt = "%(asctime)s.%(msecs)03d " + log_fmt if log_time else log_fmt lf = log.Formatter(log_fmt, time_fmt) ll = log.getLevelName(log_level) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: ttcn3-bts-test Gerrit-Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Gerrit-Change-Number: 41653 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in osmocom-bb[ttcn3-bts-test]: trx_toolkit: print milliseconds in logging
by fixeria 11 Dec '25

11 Dec '25

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41653?usp=email ) Change subject: trx_toolkit: print milliseconds in logging ...................................................................... Abandoned I'll push directly instead. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmocom-bb Gerrit-Branch: ttcn3-bts-test Gerrit-Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Gerrit-Change-Number: 41653 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in osmo-bts[master]: doc: osmo-bts-virtual.cfg: drop non-existent logging category
by fixeria 11 Dec '25

11 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41654?usp=email ) Change subject: doc: osmo-bts-virtual.cfg: drop non-existent logging category ...................................................................... doc: osmo-bts-virtual.cfg: drop non-existent logging category Change-Id: I12dcce71dea0ec2f6cb244a716d997bba4eda1ed Related: df505a503 ("logging: get rid of logging category DSUM") --- M doc/examples/virtual/osmo-bts-virtual.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/54/41654/1 diff --git a/doc/examples/virtual/osmo-bts-virtual.cfg b/doc/examples/virtual/osmo-bts-virtual.cfg index 4663f17..11b71b1 100644 --- a/doc/examples/virtual/osmo-bts-virtual.cfg +++ b/doc/examples/virtual/osmo-bts-virtual.cfg @@ -24,7 +24,6 @@ logging level loop notice logging level abis debug logging level rtp notice - logging level sum error logging level lglobal notice logging level llapd notice logging level linp notice -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I12dcce71dea0ec2f6cb244a716d997bba4eda1ed Gerrit-Change-Number: 41654 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: osmo-bts-{lc15,omldummy,virtual}: drop LIBGPS_{CFLAGS,LIBS}
by fixeria 11 Dec '25

11 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41655?usp=email ) Change subject: osmo-bts-{lc15,omldummy,virtual}: drop LIBGPS_{CFLAGS,LIBS} ...................................................................... osmo-bts-{lc15,omldummy,virtual}: drop LIBGPS_{CFLAGS,LIBS} None of these backends use libgps, only osmo-bts-{oc2g,sysmo} do. Change-Id: I951a6ec1dc6a3213dd7b2a0a9460b97e827d98c2 --- M src/osmo-bts-lc15/Makefile.am M src/osmo-bts-omldummy/Makefile.am M src/osmo-bts-virtual/Makefile.am 3 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/41655/1 diff --git a/src/osmo-bts-lc15/Makefile.am b/src/osmo-bts-lc15/Makefile.am index 58284e9..6a98a91 100644 --- a/src/osmo-bts-lc15/Makefile.am +++ b/src/osmo-bts-lc15/Makefile.am @@ -12,7 +12,6 @@ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ - $(LIBGPS_CFLAGS) \ $(LIBSYSTEMD_CFLAGS) \ $(NULL) @@ -91,7 +90,6 @@ lc15bts_mgr_LDADD = \ $(top_builddir)/src/common/libbts.a \ $(COMMON_LDADD) \ - $(LIBGPS_LIBS) \ $(LIBSYSTEMD_LIBS) \ $(NULL) diff --git a/src/osmo-bts-omldummy/Makefile.am b/src/osmo-bts-omldummy/Makefile.am index f7a0504..164dacc 100644 --- a/src/osmo-bts-omldummy/Makefile.am +++ b/src/osmo-bts-omldummy/Makefile.am @@ -7,7 +7,6 @@ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ - $(LIBGPS_CFLAGS) \ $(NULL) AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude diff --git a/src/osmo-bts-virtual/Makefile.am b/src/osmo-bts-virtual/Makefile.am index bbb79ec..7c34fc1 100644 --- a/src/osmo-bts-virtual/Makefile.am +++ b/src/osmo-bts-virtual/Makefile.am @@ -8,7 +8,6 @@ $(LIBOSMOTRAU_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) \ $(LIBOSMOCODEC_CFLAGS) \ - $(LIBGPS_CFLAGS) \ $(NULL) AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I951a6ec1dc6a3213dd7b2a0a9460b97e827d98c2 Gerrit-Change-Number: 41655 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: debian/control: drop 'txt2man' from Build-Depends
by fixeria 11 Dec '25

11 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41656?usp=email ) Change subject: debian/control: drop 'txt2man' from Build-Depends ...................................................................... debian/control: drop 'txt2man' from Build-Depends We're not using this tool during the build. Change-Id: I9b971ae9b748f471e677446f3a8bfc9f01348349 --- M debian/control 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/41656/1 diff --git a/debian/control b/debian/control index bab9024..28718af 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ libosmo-abis-dev (>= 2.1.0), libosmo-netif-dev (>= 1.7.0), libgps-dev, - txt2man, osmo-gsm-manuals-dev (>= 1.7.0) Standards-Version: 3.9.8 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9b971ae9b748f471e677446f3a8bfc9f01348349 Gerrit-Change-Number: 41656 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: debian/control: drop 'libgps-dev' from Build-Depends
by fixeria 11 Dec '25

11 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/41657?usp=email ) Change subject: debian/control: drop 'libgps-dev' from Build-Depends ...................................................................... debian/control: drop 'libgps-dev' from Build-Depends So far only osmo-bts-{oc2g,sysmo} use libgps, however we don't build any packages for DSP-based backends. Change-Id: If20391546472a63687622c46e0d30119d675a3fb --- M debian/control 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/57/41657/1 diff --git a/debian/control b/debian/control index 28718af..f52829c 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ libosmocore-dev (>= 1.12.0), libosmo-abis-dev (>= 2.1.0), libosmo-netif-dev (>= 1.7.0), - libgps-dev, osmo-gsm-manuals-dev (>= 1.7.0) Standards-Version: 3.9.8 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41657?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If20391546472a63687622c46e0d30119d675a3fb Gerrit-Change-Number: 41657 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[ttcn3-bts-test]: trx_toolkit: print milliseconds in logging
by fixeria 11 Dec '25

11 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41653?usp=email ) Change subject: trx_toolkit: print milliseconds in logging ...................................................................... trx_toolkit: print milliseconds in logging More preciese timestamps are helpful during debugging. Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Related: OS#6904 (cherry picked from commit 8900f2ef21976c561cd78427c61cd48fac0a108a) --- M src/target/trx_toolkit/app_common.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/53/41653/1 diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index 531d8dc..75dd5a2 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -39,7 +39,7 @@ "There is NO WARRANTY, to the extent permitted by law.\n") def add_log_handler(self, lh, log_level, log_fmt, time_fmt, log_time = False): - log_fmt = "%(asctime)s " + log_fmt if log_time else log_fmt + log_fmt = "%(asctime)s.%(msecs)03d " + log_fmt if log_time else log_fmt lf = log.Formatter(log_fmt, time_fmt) ll = log.getLevelName(log_level) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41653?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: ttcn3-bts-test Gerrit-Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Gerrit-Change-Number: 41653 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: trx_toolkit: print milliseconds in logging
by fixeria 11 Dec '25

11 Dec '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41652?usp=email ) Change subject: trx_toolkit: print milliseconds in logging ...................................................................... trx_toolkit: print milliseconds in logging More preciese timestamps are helpful during debugging. Change-Id: I7c53149f4e678670392773bbcf9648997ba4ff1b Related: OS#6904 --- M src/target/trx_toolkit/app_common.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/52/41652/1 diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py index 531d8dc..75dd5a2 100644 --- a/src/target/trx_toolkit/app_common.py +++ b/src/target/trx_toolkit/app_common.py @@ -39,7 +39,7 @@ "There is NO WARRANTY, to the extent permitted by law.\n") def add_log_handler(self, lh, log_level, log_fmt, time_fmt, log_time = False): - log_fmt = "%(asctime)s " + log_fmt if log_time else log_fmt + log_fmt = "%(asctime)s.%(msecs)03d " + log_fmt if log_time else log_fmt lf = log.Formatter(log_fmt, time_fmt) ll = log.getLevelName(log_level) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41652?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: I7c53149f4e678670392773bbcf9648997ba4ff1b Gerrit-Change-Number: 41652 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in libosmo-netif[master]: cosmetic: stream_cli: Fix typos in API documentation
by fixeria 11 Dec '25

11 Dec '25

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41651?usp=email ) Change subject: cosmetic: stream_cli: Fix typos in API documentation ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/41651/comment/87f9b8fc_e73599b… : PS1, Line 879: socket nitpick: simply say `the stream client` here to avoid `set the socket type for ... socket`? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41651?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Icb3c567df9fa287667996af34b652f80f12a816e Gerrit-Change-Number: 41651 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 11 Dec 2025 18:47:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0