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

Change in osmo-bts[master]: shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C

by fixeria

Attention is currently required from: pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30615 ) Change subject: shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I71c46478b8f3b236dba3e959fc75e58c0409517f Gerrit-Change-Number: 30615 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 11:17:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload

by dexter

Attention is currently required from: laforge, pespin, fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/30523 to look at the new patch set (#5). Change subject: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload ...................................................................... l1sap: Accept RFC5993 and TS 101.318 HR GSM payload Unfotunately there are two different RTP formats for HR GSM specified and it is unclear which should be used with GSM networks. Also esch BTS model may have a preference for either one or the other format. Lets set internal flags to determine the preference for each BTS model and then lets use this information to convert incoming RTP packets into the prefered format. Doing so we will make sure that always both formats are accepted. Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Related: OS#5688 --- M include/osmo-bts/bts.h M include/osmo-bts/lchan.h M src/common/l1sap.c M src/osmo-bts-lc15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c 8 files changed, 70 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/30523/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Gerrit-Change-Number: 30523 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload

by dexter

Attention is currently required from: laforge, pespin, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30523 ) Change subject: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload ...................................................................... Patch Set 5: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/30523/comment/6257ba17_285a1b96 PS3, Line 1915: * reception depending on what the particular BTS model supports. In case no preference is set, it will be > agreeing with pespin. osmo-bts-octphy is unmaintained, nobody knows if it works at all. I made an educated guess for all other BTS models. They all set a format (except octphy and the omldummy). In cases where no format is specified we drop the payload now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Gerrit-Change-Number: 30523 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 10:36:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: abis: Add a timeout while waiting for connect()

by daniel

daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30588 ) Change subject: abis: Add a timeout while waiting for connect() ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b985d9ee472d5a39bc3da1dce1137ebabe93e85 Gerrit-Change-Number: 30588 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/30615 ) Change subject: shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C ...................................................................... shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C For the other shutdown causes power ramping doesn't make sense. Instead shutdown quickly so we can reconnect faster Change-Id: I71c46478b8f3b236dba3e959fc75e58c0409517f Related: SYS#6237 --- M include/osmo-bts/bts.h M src/common/bts_shutdown_fsm.c M src/common/main.c M src/osmo-bts-trx/l1_if.c 4 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/30615/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index b1a594c..bd66443 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -396,7 +396,7 @@ int bts_init(struct gsm_bts *bts); void bts_shutdown(struct gsm_bts *bts, const char *reason); -void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc); +void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc, bool do_power_ramp); int bts_link_estab(struct gsm_bts *bts); diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index 0c6d80c..f7a38d6 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -56,6 +56,7 @@ static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + bool do_power_ramping = *(bool *)data; unsigned int count; switch(event) { case BTS_SHUTDOWN_EV_START: @@ -63,10 +64,10 @@ osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SHUTDOWN_START, NULL); count = count_trx_operational(bts); - if (count) { + if (count && do_power_ramping) { bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL); } else { - /* we can skip ramp down since no TRX is running anyway. + /* we can skip ramp down if it was requested or no TRX is running anyway. * Let's jump into WAIT_TRX_CLOSED to make sure we * tell lower layer to close all TRX in case there's some * open() WIP */ @@ -250,7 +251,7 @@ return fi->state != BTS_SHUTDOWN_ST_NONE; } -void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc) +void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc, bool do_power_ramp) { struct osmo_fsm_inst *fi = bts->shutdown_fi; if (bts_shutdown_in_progress(bts)) { @@ -262,12 +263,12 @@ bts->shutdown_fi_exit_proc = exit_proc; LOGPFSML(fi, LOGL_NOTICE, "Shutting down BTS, exit %u, reason: %s\n", exit_proc, reason); - osmo_fsm_inst_dispatch(fi, BTS_SHUTDOWN_EV_START, NULL); + osmo_fsm_inst_dispatch(fi, BTS_SHUTDOWN_EV_START, &do_power_ramp); } void bts_shutdown(struct gsm_bts *bts, const char *reason) { - bts_shutdown_ext(bts, reason, true); + bts_shutdown_ext(bts, reason, true, false); } void bts_model_trx_close_cb(struct gsm_bts_trx *trx, int rc) diff --git a/src/common/main.c b/src/common/main.c index 954cc34..ea6c61e 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -233,7 +233,7 @@ oml_tx_failure_event_rep(&g_bts->mo, NM_SEVER_CRITICAL, OSMO_EVT_CRIT_PROC_STOP, "BTS: SIGINT received -> shutdown"); - bts_shutdown(g_bts, "SIGINT"); + bts_shutdown_ext(g_bts, "SIGINT", true, false); } quit++; break; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 8c364c3..dc90bf9 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -195,7 +195,7 @@ { /* Go into shutdown state deactivating transceivers until Abis link * becomes up again */ - bts_shutdown_ext(bts, "Abis close", false); + bts_shutdown_ext(bts, "Abis close", false, false); } int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I71c46478b8f3b236dba3e959fc75e58c0409517f Gerrit-Change-Number: 30615 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: logging: rework the macros

by neels

Attention is currently required from: Hoernchen. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30610 ) Change subject: logging: rework the macros ...................................................................... Patch Set 1: Code-Review-2 (2 comments) File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/30610/comment/3b84c434_dcbbf700 PS1, Line 64: if (log_check_level(ss, level)) \ it is a hugely important performance decision to do log_check_level() in the macro, *before* passing the varargs to logp2(). That is the entire point why log_check_level() was introduced in this way: if no logging target will print this log message, we can skip all of the string composition for the log message entirely. For example, in this: LOGP(DMAIN, LOGL_DEBUG, "data: %s\n", osmo_hexdump(data, len)); we skip calling osmo_hexdump() when DMAIN's DEBUG is not enabled anywhere. With your code changes, we would first call osmo_hexdump(), pass the result to logp2_with_check(), and only then discard the log message. That would be a massive performance dip for loaded sites where DEBUG logging is switched off. Now, because log_check_level() is called first, we need to check whether logging was initialized and redirect to logp_stub() even before that -- log_check_level() just aborts the program, with assert(osmo_log_info) File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/30610/comment/afc179d9_a081d87a PS1, Line 87: struct log_info *osmo_log_info; (undoing part of earlier patch) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03efa954cb9e991d2c3da4b61b12aac651e0efa2 Gerrit-Change-Number: 30610 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 02:32:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: logging: do not expose internal data structures

by neels

Attention is currently required from: Hoernchen. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30609 ) Change subject: logging: do not expose internal data structures ...................................................................... Patch Set 1: Code-Review-2 (1 comment) File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/30609/comment/9d0aa7d8_8e9e5338 PS1, Line 14: extern struct log_info *osmo_log_info; osmo_log_info is how logging_vty.c knows about logging config. How did you adjust for that? Changing public API is a problem, we need to keep this publicly accessible simply because it was public API before, in order to guarantee backwards compat in API. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ba3506233ff485f3935b2f46c94d8351b5d283c Gerrit-Change-Number: 30609 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 02:29:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: logging: rework the macros

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30610 ) Change subject: logging: rework the macros ...................................................................... Patch Set 1: Code-Review-2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/30610/comment/0156bff9_b11f202f PS1, Line 9: For some reason > I guess the idea was to avoid function calls? What's even more important is that with macros we can do lazy format string evaluation: https://people.osmocom.org/fixeria/logp_test.c With a function the arguments (like osmo_hexdump() calls) will always be evaluated, regardless of the current logging level. So I vote against this patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03efa954cb9e991d2c3da4b61b12aac651e0efa2 Gerrit-Change-Number: 30610 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 02:10:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: logging: rework the macros

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30610 ) Change subject: logging: rework the macros ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/30610/comment/e1a52a02_dcffc5dd PS1, Line 9: For some reason I guess the idea was to avoid function calls? https://gerrit.osmocom.org/c/libosmocore/+/30610/comment/171ea650_793f1708 PS1, Line 10: one single logging : func If we go for this, shouldn't this function be 'static inline' in the header? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03efa954cb9e991d2c3da4b61b12aac651e0efa2 Gerrit-Change-Number: 30610 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 02:06:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: logging: rework the macros

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30610 ) Change subject: logging: rework the macros ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/30610/comment/7804f198_7676e6c9 PS1, Line 778: if (tall_log_ctx == NULL) { There was a 'break' in the macro, so that either the fallback or the normal logic is executed. Now you're changing the flow to execute both fallback or the normal logic if tall_log_ctx is NULL. This is wrong. You need to do 'else if' here to avoid executing both. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03efa954cb9e991d2c3da4b61b12aac651e0efa2 Gerrit-Change-Number: 30610 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 01:34:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022