laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31913 )
Change subject: rsl: reduce logging verbosity on some messages
......................................................................
rsl: reduce logging verbosity on some messages
These two messages indicate that no ACK/NACK message is going to be
sent to the BSC because activation/deactivation was requested by the
PCU. This is absolutely normal and requires no attention from the
user/operator, so better use LOGL_INFO.
Change-Id: I6eaf3a6c07fb30b31c045729c935c8ad6735e5c8
---
M src/common/rsl.c
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/common/rsl.c b/src/common/rsl.c
index c7061b2..c537998 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1295,7 +1295,7 @@
}
if (!send_rel_ack) {
- LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "not sending REL ACK\n");
+ LOGPLCHAN(lchan, DRSL, LOGL_INFO, "not sending REL ACK\n");
return 0;
}
@@ -1386,7 +1386,7 @@
int rsl_tx_chan_act_acknack(struct gsm_lchan *lchan, uint8_t cause)
{
if (lchan->rel_act_kind != LCHAN_REL_ACT_RSL) {
- LOGPLCHAN(lchan, DRSL, LOGL_NOTICE, "not sending CHAN ACT %s\n",
+ LOGPLCHAN(lchan, DRSL, LOGL_INFO, "not sending CHAN ACT %s\n",
cause ? "NACK" : "ACK");
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31913
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6eaf3a6c07fb30b31c045729c935c8ad6735e5c8
Gerrit-Change-Number: 31913
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31914 )
Change subject: {context,select}: cosmetic: use OTC_SELECT instead of osmo_ctx->select
......................................................................
Patch Set 2: Code-Review-1
(1 comment)
Patchset:
PS2:
I don't really see the improvement here. The OTC_GLOBAL / OTC_SELECT constants are convenience helpers for the user who shouldn't care about the implementation. But for the implementation internally, there's nothing wrong with the way how current code is written.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31914
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2aa03c7c68b7cca17eebbf858ada7c42f0d0a1da
Gerrit-Change-Number: 31914
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 14 Mar 2023 15:25:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31911 )
Change subject: on_dso_load_select: run after on_dso_load_ctx
......................................................................
on_dso_load_select: run after on_dso_load_ctx
Add priorities to ensure on_dso_load_select runs after on_dso_load_ctx.
Otherwise osmo_ctx->global (used via define OTC_GLOBAL) points to NULL
and causes a segfault in osmo_fd_lookup_table_extend.
Use numbers 101 and 102, as "0 to 100 are reserved for the
implementation" and cause an error from GCC.
Fixes: OS#5946
Fixes: c46a15d8 ("select: Optimize osmo_fd_get_by_fd")
Change-Id: Ia2518e82530b93c535f8f5105513e21559b895ba
---
M src/core/context.c
M src/core/select.c
2 files changed, 22 insertions(+), 3 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/core/context.c b/src/core/context.c
index 6b58565..a0b3a55 100644
--- a/src/core/context.c
+++ b/src/core/context.c
@@ -39,7 +39,7 @@
}
/* initialize osmo_ctx on main tread */
-static __attribute__((constructor)) void on_dso_load_ctx(void)
+static __attribute__((constructor(101))) void on_dso_load_ctx(void)
{
OSMO_ASSERT(osmo_ctx_init("main") == 0);
}
diff --git a/src/core/select.c b/src/core/select.c
index c60cd8e..69fa763 100644
--- a/src/core/select.c
+++ b/src/core/select.c
@@ -534,8 +534,9 @@
osmo_fd_lookup_table_extend(0);
}
-/* ensure main thread always has pre-initialized osmo_fds */
-static __attribute__((constructor)) void on_dso_load_select(void)
+/* ensure main thread always has pre-initialized osmo_fds
+ * priority 102: must run after on_dso_load_ctx */
+static __attribute__((constructor(102))) void on_dso_load_select(void)
{
osmo_select_init();
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31911
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia2518e82530b93c535f8f5105513e21559b895ba
Gerrit-Change-Number: 31911
Gerrit-PatchSet: 4
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>
Gerrit-MessageType: merged
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31911 )
Change subject: on_dso_load_select: run after on_dso_load_ctx
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31911
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia2518e82530b93c535f8f5105513e21559b895ba
Gerrit-Change-Number: 31911
Gerrit-PatchSet: 3
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, 14 Mar 2023 15:22:10 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31909 )
Change subject: logging.c: Sanitize calls to osmo_fd_unregister()
......................................................................
logging.c: Sanitize calls to osmo_fd_unregister()
It makes no sense to call osmo_fd_unregister() on a negative fd.
Let's also make sure we set fd to negative value after unregistering +
closing, even if the struct is going to be freed afterwards.
Change-Id: I0790a63e603028c11cc475d483c6528e4d9aa9ab
---
M src/core/logging.c
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/core/logging.c b/src/core/logging.c
index bcfe318..3095f0d 100644
--- a/src/core/logging.c
+++ b/src/core/logging.c
@@ -1161,6 +1161,7 @@
if (target->type == LOG_TGT_TYPE_FILE) {
osmo_fd_unregister(&wq->bfd);
close(wq->bfd.fd);
+ wq->bfd.fd = -1;
}
/* release the queue itself */
@@ -1327,8 +1328,8 @@
}
wq = target->tgt_file.wqueue;
if (wq) {
- osmo_fd_unregister(&wq->bfd);
if (wq->bfd.fd >= 0) {
+ osmo_fd_unregister(&wq->bfd);
if (target->type == LOG_TGT_TYPE_FILE)
close(wq->bfd.fd);
wq->bfd.fd = -1;
@@ -1375,8 +1376,8 @@
return -errno;
} else {
wq = target->tgt_file.wqueue;
- osmo_fd_unregister(&wq->bfd);
if (wq->bfd.fd >= 0) {
+ osmo_fd_unregister(&wq->bfd);
close(wq->bfd.fd);
wq->bfd.fd = -1;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31909
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0790a63e603028c11cc475d483c6528e4d9aa9ab
Gerrit-Change-Number: 31909
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(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>
Gerrit-MessageType: merged
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31655 )
Change subject: modem: clean up #includes (using include-what-you-use)
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS1:
> Please elaborate on how exactly you've called iwyu - seems like the result is broken for some reason […]
It fails to link the binary (looks like some incompatibility with libtool), but still produces lots of warnings during the compilation stage. I simply addressed these warnings, did `make clean`, and then ran `make` again to make sure the warnings are gone.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31655
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I728f3eea1590f46bef6e0eb4beb9714f6c9a1614
Gerrit-Change-Number: 31655
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 14 Mar 2023 15:06:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: comment