Attention is currently required from: daniel, fixeria, neels, pespin.
Hello Jenkins Builder, daniel, fixeria, neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/41992?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Verified+1 by Jenkins Builder
Change subject: Lb: Handle SCCP N-NOTICE.ind
......................................................................
Lb: Handle SCCP N-NOTICE.ind
Change-Id: I689bf2f2c4311fbc1da92f02c27078a1c00dda1a
---
M src/osmo-bsc/lb.c
1 file changed, 49 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/41992/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41992?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I689bf2f2c4311fbc1da92f02c27078a1c00dda1a
Gerrit-Change-Number: 41992
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Attention is currently required from: laforge, pespin.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41995?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by laforge
Change subject: bsc: Don't start virtual SMLC in TC_lcs_loc_req_without_smlc
......................................................................
bsc: Don't start virtual SMLC in TC_lcs_loc_req_without_smlc
The SMLC is not needed at all in that test. In fact, we want it to not
be available. Starting it now within that test, where the BSC Lb link is
torn down (f_vty_enable_smlc(false)) may create race conditions where
the SMLC ttcn3 code (BSSMAP_LE_Emulation) will try to get the RESET
procedure ongoing, which the BSC SCCP stack may reject (SCCP UDTS) due
to the SCCP User being unbound during the VTY command above to disable
the Lb Link.
Change-Id: Idb98e4d907feaafdaf3f5bf044c0c50b6d943d01
---
M bsc/BSC_Tests.ttcn
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/41995/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41995?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Idb98e4d907feaafdaf3f5bf044c0c50b6d943d01
Gerrit-Change-Number: 41995
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41986?usp=email )
Change subject: logging: Also Avoid infinite loop/deadlock in log_check_level()
......................................................................
logging: Also Avoid infinite loop/deadlock in log_check_level()
A LOG() macro being called inside an already-logging path will first
call log_check_level() before calling osmo_vlogp(). Since calling
happens with the mutex hold, it has been seen to deadlock in eg.
osmo-hnbgw.
Change-Id: I0098629b335b3aa174b49fd79c33d22b04bc4785
---
M src/core/logging.c
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
jolly: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/core/logging.c b/src/core/logging.c
index 60634af..db5433e 100644
--- a/src/core/logging.c
+++ b/src/core/logging.c
@@ -753,7 +753,8 @@
if (OSMO_UNLIKELY(log_thread_state.logging_active)) {
/* Avoid re-entrant logging: If logging to log target generates
* extra logging (eg. an error log line due to some wqueue being full),
- * we may end up in an infinite loop. */
+ * we may end up in an infinite loop, or deadlock trying to re-acquire
+ * this same lock. */
return;
}
log_thread_state.logging_active = true;
@@ -1397,6 +1398,13 @@
/* TODO: The following could/should be cached (update on config) */
+ if (OSMO_UNLIKELY(log_thread_state.logging_active)) {
+ /* Avoid re-entrant logging: If logging to log target generates
+ * extra logging (eg. an error log line due to some wqueue being full),
+ * we may end up in an infinite loop, or deadlock trying to re-acquire
+ * this same lock. */
+ return 0;
+ }
log_tgt_mutex_lock();
llist_for_each_entry(tar, &osmo_log_target_list, entry) {
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41986?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0098629b335b3aa174b49fd79c33d22b04bc4785
Gerrit-Change-Number: 41986
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>