- gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: firmware/layer1: clarify L1CTL_DM_EST_REQ related logging
by fixeria 13 May '22

13 May '22

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28109 to look at the new patch set (#2). Change subject: firmware/layer1: clarify L1CTL_DM_EST_REQ related logging ...................................................................... firmware/layer1: clarify L1CTL_DM_EST_REQ related logging Change-Id: I7a7fb32eab0ab20672a47861c3b66da92bd83015 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/28109/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7a7fb32eab0ab20672a47861c3b66da92bd83015 Gerrit-Change-Number: 28109 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmocom-bb[master]: layer23: chantype_rsl2gsmtap() is deprecated, use chantype_rsl2gsmtap2()
by fixeria 13 May '22

13 May '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28111 ) Change subject: layer23: chantype_rsl2gsmtap() is deprecated, use chantype_rsl2gsmtap2() ...................................................................... layer23: chantype_rsl2gsmtap() is deprecated, use chantype_rsl2gsmtap2() Change-Id: Id54b973cec8479fc32775be260f8a9fac8f09bae --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/11/28111/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 9af6167..5e02dbe 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -82,7 +82,7 @@ static uint8_t chantype_rsl2gsmtap_ext(uint8_t rsl_chantype, uint8_t link_id, uint32_t fn, uint8_t num_agch) { - uint8_t ret = chantype_rsl2gsmtap(rsl_chantype, link_id); + uint8_t ret = chantype_rsl2gsmtap2(rsl_chantype, link_id, false); if (ret != GSMTAP_CHANNEL_PCH) return ret; @@ -387,7 +387,7 @@ /* send copy via GSMTAP */ rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, link_id); + gsmtap_chan_type = chantype_rsl2gsmtap2(chan_type, link_id, false); gsmtap_send(gsmtap_inst, ms->rrlayer.cd_now.arfcn | GSMTAP_ARFCN_F_UPLINK, chan_ts, gsmtap_chan_type, chan_ss, 0, 127, 255, msg->l2h, msgb_l2len(msg)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id54b973cec8479fc32775be260f8a9fac8f09bae Gerrit-Change-Number: 28111 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmocom-bb[master]: firmware/layer1: clarify L1CTL_DM_EST_REQ related logging
by fixeria 13 May '22

13 May '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28109 ) Change subject: firmware/layer1: clarify L1CTL_DM_EST_REQ related logging ...................................................................... firmware/layer1: clarify L1CTL_DM_EST_REQ related logging Change-Id: I7a7fb32eab0ab20672a47861c3b66da92bd83015 --- M src/target/firmware/layer1/l23_api.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/28109/1 diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c index 275043b..e4b0646 100644 --- a/src/target/firmware/layer1/l23_api.c +++ b/src/target/firmware/layer1/l23_api.c @@ -257,8 +257,8 @@ struct l1ctl_info_ul *ul = (struct l1ctl_info_ul *) l1h->data; struct l1ctl_dm_est_req *est_req = (struct l1ctl_dm_est_req *) ul->payload; - printd("L1CTL_DM_EST_REQ (arfcn=%u, chan_nr=0x%02x, tsc=%u)\n", - ntohs(est_req->h0.band_arfcn), ul->chan_nr, est_req->tsc); + printd("L1CTL_DM_EST_REQ (chan_nr=0x%02x, tsc=%u)\n", + ul->chan_nr, est_req->tsc); /* disable neighbour cell measurement of C0 TS 0 */ mframe_disable(MF_TASK_NEIGH_PM51_C0T0); @@ -276,8 +276,12 @@ l1s.dedicated.h1.n = est_req->h1.n; for (i=0; i<est_req->h1.n; i++) l1s.dedicated.h1.ma[i] = ntohs(est_req->h1.ma[i]); + printd("L1CTL_DM_EST_REQ indicates H1 (HSN=%u, MAIO=%u, chans=%u)\n", + est_req->h1.hsn, est_req->h1.maio, est_req->h1.n); } else { l1s.dedicated.h0.arfcn = ntohs(est_req->h0.band_arfcn); + printd("L1CTL_DM_EST_REQ indicates H0 (ARFCN=%u)\n", + l1s.dedicated.h0.arfcn &~ ARFCN_FLAG_MASK); } /* TCH config */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7a7fb32eab0ab20672a47861c3b66da92bd83015 Gerrit-Change-Number: 28109 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmocom-bb[master]: trxcon: clarify L1CTL_DM_REL_REQ related logging
by fixeria 13 May '22

13 May '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28110 ) Change subject: trxcon: clarify L1CTL_DM_REL_REQ related logging ...................................................................... trxcon: clarify L1CTL_DM_REL_REQ related logging In reality, trxcon does not switch back to BCCH itself. Neither the firmware does, so let's correct this confusing log message. Change-Id: Iad308ad980af4caa7d7d1b358ba7288885f96e04 --- M src/host/trxcon/l1ctl.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/28110/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 95ba9b6..94a4d18 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -687,8 +687,7 @@ static int l1ctl_rx_dm_rel_req(struct l1ctl_link *l1l, struct msgb *msg) { - LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_REL_REQ, " - "switching back to CCCH\n"); + LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_REL_REQ, resetting scheduler\n"); /* Reset scheduler */ sched_trx_reset(l1l->trx, false); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iad308ad980af4caa7d7d1b358ba7288885f96e04 Gerrit-Change-Number: 28110 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmocom-bb[master]: firmware/tiffs/readfile: fix -Wbuiltin-declaration-mismatch
by fixeria 13 May '22

13 May '22

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27875 ) Change subject: firmware/tiffs/readfile: fix -Wbuiltin-declaration-mismatch ...................................................................... Abandoned Not worth spending time on it. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8ec64054f24fe43cfec66d2d331e18b780b3951 Gerrit-Change-Number: 27875 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 0

Change in osmo-msc[master]: call rate_ctr_init() to make rate counters work properly
by fixeria 13 May '22

13 May '22

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28107 ) Change subject: call rate_ctr_init() to make rate counters work properly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I27282051a6da5d1e1a25981712fbe4c4a6378dea Gerrit-Change-Number: 28107 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 13 May 2022 19:34:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: switch sqlite3 to single-threaded mode
by pespin 13 May '22

13 May '22

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28108 ) Change subject: switch sqlite3 to single-threaded mode ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5bbea90d28b6d73b64b9e5124ff59304b90a8a75 Gerrit-Change-Number: 28108 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 13 May 2022 18:00:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: call rate_ctr_init() to make rate counters work properly
by pespin 13 May '22

13 May '22

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28107 ) Change subject: call rate_ctr_init() to make rate counters work properly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I27282051a6da5d1e1a25981712fbe4c4a6378dea Gerrit-Change-Number: 28107 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 13 May 2022 17:59:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: switch sqlite3 to single-threaded mode
by laforge 13 May '22

13 May '22

laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/28108 ) Change subject: switch sqlite3 to single-threaded mode ...................................................................... switch sqlite3 to single-threaded mode Looking at 'perf top' of osmo-msc under load shows that there's a significant amount of time spent in terms of locking (mutex,...) which is useless as osmo-msc is a single-threaded application. Unfortunately libdbi doesn't provide a mechanism to perform sqlite3_config(), so we have to do it directly here, introducing an explicit build-time dependency (and linkage) to libsqlite3. Related: OS#5559 Change-Id: I5bbea90d28b6d73b64b9e5124ff59304b90a8a75 --- M configure.ac M src/libmsc/db.c M src/osmo-msc/Makefile.am M tests/db_sms/Makefile.am M tests/msc_vlr/Makefile.am M tests/sms_queue/Makefile.am 6 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/28108/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5bbea90d28b6d73b64b9e5124ff59304b90a8a75 Gerrit-Change-Number: 28108 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in osmo-msc[master]: switch sqlite3 to single-threaded mode
by laforge 13 May '22

13 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/28108 ) Change subject: switch sqlite3 to single-threaded mode ...................................................................... switch sqlite3 to single-threaded mode Looking at 'perf top' of osmo-msc under load shows that there's a significant amount of time spent in terms of locking (mutex,...) which is useless as osmo-msc is a single-threaded application. Unfortunately libdbi doesn't provide a mechanism to perform sqlite3_config(), so we have to do it directly here, introducing an explicit build-time dependency (and linkage) to libsqlite3. Change-Id: I5bbea90d28b6d73b64b9e5124ff59304b90a8a75 --- M configure.ac M src/libmsc/db.c M src/osmo-msc/Makefile.am M tests/db_sms/Makefile.am M tests/msc_vlr/Makefile.am M tests/sms_queue/Makefile.am 6 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/28108/1 diff --git a/configure.ac b/configure.ac index 3395ecc..1fd7260 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ fi PKG_PROG_PKG_CONFIG([0.20]) +PKG_CHECK_MODULES(LIBSQLITE3, sqlite3) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.6.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.6.0) PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.6.0) diff --git a/src/libmsc/db.c b/src/libmsc/db.c index a1683be..d3d37c7 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -28,6 +28,7 @@ #include <string.h> #include <errno.h> #include <time.h> +#include <sqlite3.h> #include <dbi/dbi.h> #include <osmocom/msc/gsm_data.h> @@ -637,6 +638,8 @@ int db_init(const char *name) { + sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); + dbi_initialize_r(NULL, &inst); LOGP(DDB, LOGL_NOTICE, "Init database connection to '%s' using %s\n", diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am index 7b56c74..1492918 100644 --- a/src/osmo-msc/Makefile.am +++ b/src/osmo-msc/Makefile.am @@ -19,6 +19,7 @@ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOGSUPCLIENT_CFLAGS) \ + $(LIBSQLITE3_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -48,6 +49,7 @@ $(LIBOSMOSIGTRAN_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBOSMOGSUPCLIENT_LIBS) \ + $(LIBSQLITE3_LIBS) \ -ldbi \ -lsctp \ $(NULL) diff --git a/tests/db_sms/Makefile.am b/tests/db_sms/Makefile.am index 52fd35e..52e8cab 100644 --- a/tests/db_sms/Makefile.am +++ b/tests/db_sms/Makefile.am @@ -17,6 +17,7 @@ $(LIBSMPP34_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOGSUPCLIENT_CFLAGS) \ + $(LIBSQLITE3_CFLAGS) \ $(NULL) EXTRA_DIST = \ @@ -46,6 +47,7 @@ $(LIBASN1C_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBOSMOGSUPCLIENT_LIBS) \ + $(LIBSQLITE3_LIBS) \ $(LIBRARY_GSM) \ -ldbi \ $(NULL) diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index a84ea3f..b1853a1 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -17,6 +17,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOGSUPCLIENT_CFLAGS) \ + $(LIBSQLITE3_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -41,6 +42,7 @@ $(LIBASN1C_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBOSMOGSUPCLIENT_LIBS) \ + $(LIBSQLITE3_LIBS) \ $(LIBRARY_GSM) \ -ldbi \ $(NULL) diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am index a739101..0375497 100644 --- a/tests/sms_queue/Makefile.am +++ b/tests/sms_queue/Makefile.am @@ -15,6 +15,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOGSUPCLIENT_CFLAGS) \ + $(LIBSQLITE3_CFLAGS) \ $(NULL) EXTRA_DIST = \ @@ -43,6 +44,7 @@ $(LIBASN1C_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBOSMOGSUPCLIENT_LIBS) \ + $(LIBSQLITE3_LIBS) \ $(LIBRARY_GSM) \ -ldbi \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5bbea90d28b6d73b64b9e5124ff59304b90a8a75 Gerrit-Change-Number: 28108 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log