January 2026 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add MME pool related REST definitions
by fixeria 19 Jan '26

19 Jan '26

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41764?usp=email ) Change subject: s1gw: add MME pool related REST definitions ...................................................................... Patch Set 1: (1 comment) File s1gw/S1GW_REST_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41764/comment/91e7df7d_1c81… : PS1, Line 66: var HTTPMessage rsp := f_http_transact("/mme-list", method := "POST", > Is `/mme-list` correct here, or should it be `/mme`? `/mme-list` is correct, `/mme` is for a specific MME that already exists in the pool. This matches the OpenAPI definition: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41282/5/contrib/openapi.yaml. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I76f1a5cf41331d021c08fbefdf78e34da4ac2121 Gerrit-Change-Number: 41764 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Jan 2026 12:46:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: Fix esim.saip.ProfileElementSequence.remove_naas_of_type
by dexter 19 Jan '26

19 Jan '26

Attention is currently required from: laforge, lynxis lazus. dexter has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/41836?usp=email ) Change subject: Fix esim.saip.ProfileElementSequence.remove_naas_of_type ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: To me this looks ok and apparently it was also tested in practice. Commit Message: https://gerrit.osmocom.org/c/pysim/+/41836/comment/ca3c101e_e59a2d47?usp=em… : PS1, Line 28: the future. I think having unittests would be very helpful. This would also make reviewing easier. At the moment I find it a bit hard to follow those SAIP related patches. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41836?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I88d862d751198c3d1648ab7f11d6e6a8fdbc41c9 Gerrit-Change-Number: 41836 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 19 Jan 2026 12:39:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: saip.validation: Verify unused mandatory services in header
by dexter 19 Jan '26

19 Jan '26

Attention is currently required from: laforge, lynxis lazus, neels. dexter has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/41835?usp=email ) Change subject: saip.validation: Verify unused mandatory services in header ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I bet this is ok. I also assume that this was tested on real-world examples. However I find it difficult to follow up to make sure the checks are indeed correct. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id0e1988ae1936a321d04bc7c3c3a33262c767d30 Gerrit-Change-Number: 41835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 19 Jan 2026 12:15:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: testenv: check ulimit -r in prepare=
by pespin 19 Jan '26

19 Jan '26

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41862?usp=email ) Change subject: bts: testenv: check ulimit -r in prepare= ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7bc1414f95e4a54a40eb7c6f7b3d6c83ce3500c6 Gerrit-Change-Number: 41862 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 19 Jan 2026 12:07:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-bts[master]: {bs,ms}_power_control: Move params inside lchan_power_ctrl_state
by pespin 19 Jan '26

19 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/41807?usp=email ) Change subject: {bs,ms}_power_control: Move params inside lchan_power_ctrl_state ...................................................................... {bs,ms}_power_control: Move params inside lchan_power_ctrl_state Those fields are also part of the power control state, since they are modified through the lifecycle of the lchan eg. during rx of CHAN (RE)ACT, MS POWER CONTROL, etc. Those should also be reset together with other fields. Moreover, with this patch we get rid of an extra indirection pointer which could be NULL (under static configuration) and hence create potential problems. Change-Id: I0e2a6c2c33e0ac9a0bc1734d83eaeafc27f2f4df --- M include/osmo-bts/lchan.h M src/common/power_control.c M src/common/rsl.c M src/common/vty.c M tests/power/bs_power_loop_test.c M tests/power/ms_power_loop_test.c 6 files changed, 74 insertions(+), 88 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 42de2f4..2b19c28 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -120,8 +120,9 @@ struct lchan_power_ctrl_state { - /* Dynamic Power Control parameters (NULL in static mode) */ - const struct gsm_power_ctrl_params *dpc_params; + /* Dynamic Power Control parameters (false = static mode) */ + bool dpc_enabled; + struct gsm_power_ctrl_params dpc_params; /* Measurement pre-processing state (for dynamic mode) */ struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; struct gsm_power_ctrl_meas_proc_state rxqual_meas_proc; @@ -356,10 +357,6 @@ struct lchan_power_ctrl_state ms_power_ctrl; struct lchan_power_ctrl_state bs_power_ctrl; - /* MS/BS Dynamic Power Control parameters */ - struct gsm_power_ctrl_params ms_dpc_params; - struct gsm_power_ctrl_params bs_dpc_params; - /* Temporary ACCH overpower capabilities and state */ struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap; bool top_acch_active; diff --git a/src/common/power_control.c b/src/common/power_control.c index c4ff5e6..a9fd77f 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -140,14 +140,18 @@ void lchan_ms_pwr_ctrl_reset(struct gsm_lchan *lchan) { struct lchan_power_ctrl_state *state = &lchan->ms_power_ctrl; + struct gsm_power_ctrl_params *params = &state->dpc_params; + struct gsm_bts_trx *trx = lchan->ts->trx; /* This below implicitly sets: - * state->dpc_params = NULL (static mode). + * state->dpc_enabled = false (static mode). * state->skip_block_num = 0, so that 1st power input is taken into account. */ memset(state, 0, sizeof(*state)); + memcpy(params, trx->ms_dpc_params, sizeof(*params)); + /* XXX: should we use the maximum power level instead of 0 dBm? */ - state->max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); + state->max = ms_pwr_ctl_lvl(trx->bts->band, 0); state->current = state->max; } @@ -170,7 +174,7 @@ static const struct gsm_power_ctrl_meas_params *lchan_get_ci_thresholds(const struct gsm_lchan *lchan) { - const struct gsm_power_ctrl_params *params = lchan->ms_power_ctrl.dpc_params; + const struct gsm_power_ctrl_params *params = &lchan->ms_power_ctrl.dpc_params; switch (lchan->type) { case GSM_LCHAN_SDCCH: @@ -204,7 +208,7 @@ const int16_t ul_lqual_cb) { struct lchan_power_ctrl_state *state = &lchan->ms_power_ctrl; - const struct gsm_power_ctrl_params *params = state->dpc_params; + const struct gsm_power_ctrl_params *params = &state->dpc_params; struct gsm_bts_trx *trx = lchan->ts->trx; struct gsm_bts *bts = trx->bts; enum gsm_band band = bts->band; @@ -217,7 +221,7 @@ if (!trx_ms_pwr_ctrl_is_osmo(trx)) return 0; - if (params == NULL) + if (!state->dpc_enabled) return 0; /* Average the input RxLev/RxQual samples (if needed). Do this before @@ -327,13 +331,17 @@ void lchan_bs_pwr_ctrl_reset(struct gsm_lchan *lchan) { struct lchan_power_ctrl_state *state = &lchan->bs_power_ctrl; + struct gsm_power_ctrl_params *params = &state->dpc_params; + struct gsm_bts_trx *trx = lchan->ts->trx; /* This below implicitly sets: + * state->dpc_enabled = false (static mode). * state->current = 0 (it's safer to start from 0 unless told differently). - * state->dpc_params = NULL (static mode). * state->skip_block_num = 0, so that 1st power input is taken into account. */ memset(state, 0, sizeof(*state)); + memcpy(params, trx->bs_dpc_params, sizeof(*params)); + state->max = 2 * 15; /* maximum defined in 9.3.4 */ } @@ -345,12 +353,12 @@ const struct gsm48_meas_res *mr) { struct lchan_power_ctrl_state *state = &lchan->bs_power_ctrl; - const struct gsm_power_ctrl_params *params = state->dpc_params; + const struct gsm_power_ctrl_params *params = &state->dpc_params; uint8_t rxqual, rxqual_avg, rxlev, rxlev_avg; int new_att; /* Check if dynamic BS Power Control is enabled */ - if (params == NULL) + if (!state->dpc_enabled) return 0; LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Rx DL Measurement Report: " diff --git a/src/common/rsl.c b/src/common/rsl.c index 23207b2..8d9dd56 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2061,35 +2061,25 @@ /* 9.3.31 (TLV) MS Power Parameters IE (vendor specific) */ if ((ie = TLVP_GET(&tp, RSL_IE_MS_POWER_PARAM)) != NULL) { - struct gsm_power_ctrl_params *params = &lchan->ms_dpc_params; - /* Parsed parameters will override per-TRX defaults */ - memcpy(params, ts->trx->ms_dpc_params, sizeof(*params)); - - if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) != 0) { + if (ie->len && parse_power_ctrl_params(&lchan->ms_power_ctrl.dpc_params, ie->val, ie->len) != 0) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Failed to parse MS Power Parameters IE\n"); return rsl_tx_chan_act_nack(lchan, RSL_ERR_IE_CONTENT); } - /* Spec explicitly states BTS should only perform * autonomous MS power control loop in BTS if 'MS Power * Parameters' IE is present! */ - lchan->ms_power_ctrl.dpc_params = params; + lchan->ms_power_ctrl.dpc_enabled = true; } /* 9.3.32 (TLV) BS Power Parameters IE (vendor specific) */ if ((ie = TLVP_GET(&tp, RSL_IE_BS_POWER_PARAM)) != NULL) { - struct gsm_power_ctrl_params *params = &lchan->bs_dpc_params; - /* Parsed parameters will override per-TRX defaults */ - memcpy(params, ts->trx->bs_dpc_params, sizeof(*params)); - - /* Parsed parameters will override per-TRX defaults */ - if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) != 0) { + if (ie->len && parse_power_ctrl_params(&lchan->bs_power_ctrl.dpc_params, ie->val, ie->len) != 0) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Failed to parse BS Power Parameters IE\n"); return rsl_tx_chan_act_nack(lchan, RSL_ERR_IE_CONTENT); } - lchan->bs_power_ctrl.dpc_params = params; + lchan->bs_power_ctrl.dpc_enabled = true; } /* 9.3.16 Physical Context */ @@ -2560,29 +2550,24 @@ /* Spec explicitly states BTS should only perform autonomous MS Power * control loop in BTS if 'MS Power Parameters' IE is present! */ - lchan->ms_power_ctrl.dpc_params = NULL; + lchan->ms_power_ctrl.dpc_enabled = false; /* 9.3.31 (TLV) MS Power Parameters IE (vendor specific) */ if ((ie = TLVP_GET(&tp, RSL_IE_MS_POWER_PARAM)) != NULL) { - struct gsm_power_ctrl_params *params = &lchan->ms_dpc_params; - + struct gsm_power_ctrl_params *params = &lchan->ms_power_ctrl.dpc_params; /* Parsed parameters will override per-TRX defaults */ memcpy(params, msg->trx->ms_dpc_params, sizeof(*params)); - /* Parsed parameters will override per-TRX defaults */ if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) != 0) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Failed to parse MS Power Parameters IE\n"); return rsl_tx_chan_act_nack(lchan, RSL_ERR_IE_CONTENT); } - - lchan->ms_power_ctrl.dpc_params = params; + lchan->ms_power_ctrl.dpc_enabled = true; } /* Only set current to max if actual value of current in dBm > value in dBm from max, or if fixed. */ - if (lchan->ms_power_ctrl.dpc_params == NULL) { - lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; - } else { + if (lchan->ms_power_ctrl.dpc_enabled) { max_pwr = ms_pwr_dbm(bts->band, lchan->ms_power_ctrl.max); curr_pwr = ms_pwr_dbm(bts->band, lchan->ms_power_ctrl.current); if (max_pwr < 0 || curr_pwr < 0) { @@ -2593,6 +2578,8 @@ } else if (curr_pwr > max_pwr) { lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; } + } else { + lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max; } bts_model_adjst_ms_pwr(lchan); @@ -2647,23 +2634,20 @@ /* 9.3.32 (TLV) BS Power Parameters IE (vendor specific) */ if ((ie = TLVP_GET(&tp, RSL_IE_BS_POWER_PARAM)) != NULL) { - struct gsm_power_ctrl_params *params = &lchan->bs_dpc_params; - + struct gsm_power_ctrl_params *params = &lchan->bs_power_ctrl.dpc_params; /* Parsed parameters will override per-TRX defaults */ memcpy(params, trx->bs_dpc_params, sizeof(*params)); - /* Parsed parameters will override per-TRX defaults */ if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) != 0) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Failed to parse BS Power Parameters IE\n"); return rsl_tx_chan_act_nack(lchan, RSL_ERR_IE_CONTENT); } - /* NOTE: it's safer to start from 0 */ lchan->bs_power_ctrl.current = 0; lchan->bs_power_ctrl.max = new; - lchan->bs_power_ctrl.dpc_params = params; + lchan->bs_power_ctrl.dpc_enabled = true; } else { - lchan->bs_power_ctrl.dpc_params = NULL; + lchan->bs_power_ctrl.dpc_enabled = false; lchan->bs_power_ctrl.current = new; } diff --git a/src/common/vty.c b/src/common/vty.c index 6964306..d169342 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1833,11 +1833,11 @@ const struct gsm_bts_trx *trx = lchan->ts->trx; cfg_out(vty, "BS (Downlink) Power Control (%s mode):%s", - st->dpc_params ? "dynamic" : "static", VTY_NEWLINE); + st->dpc_enabled ? "dynamic" : "static", VTY_NEWLINE); indent += 2; cfg_out(vty, "Channel reduction: %u dB", st->current); - if (st->dpc_params != NULL) + if (st->dpc_enabled) vty_out(vty, " (max %u dB)", st->max); vty_out(vty, "%s", VTY_NEWLINE); @@ -1848,11 +1848,11 @@ cfg_out(vty, "Actual / Nominal power: %d dBm / %d dBm%s", actual, trx->nominal_power, VTY_NEWLINE); - if (st->dpc_params == NULL) + if (!st->dpc_enabled) return; cfg_out(vty, "Power Control parameters:%s", VTY_NEWLINE); - dump_dpc_params(vty, indent + 2, st->dpc_params, false); + dump_dpc_params(vty, indent + 2, &st->dpc_params, false); } static void lchan_ms_power_ctrl_state_dump(struct vty *vty, unsigned int indent, @@ -1862,7 +1862,7 @@ const struct gsm_bts_trx *trx = lchan->ts->trx; cfg_out(vty, "MS (Uplink) Power Control (%s):%s", - st->dpc_params ? "dynamic" : "static", VTY_NEWLINE); + st->dpc_enabled ? "dynamic" : "static", VTY_NEWLINE); indent += 2; int current_dbm = ms_pwr_dbm(trx->bts->band, st->current); @@ -1870,15 +1870,15 @@ cfg_out(vty, "Current power level: %u, %d dBm", st->current, current_dbm); - if (st->dpc_params != NULL) + if (st->dpc_enabled) vty_out(vty, " (max %u, %d dBm)", st->max, max_dbm); vty_out(vty, "%s", VTY_NEWLINE); - if (st->dpc_params == NULL) + if (!st->dpc_enabled) return; cfg_out(vty, "Power Control parameters:%s", VTY_NEWLINE); - dump_dpc_params(vty, indent + 2, st->dpc_params, true); + dump_dpc_params(vty, indent + 2, &st->dpc_params, true); } static void lchan_acch_rep_state_dump(struct vty *vty, unsigned int indent, @@ -2604,7 +2604,6 @@ "Enable the power control loop\n", CMD_ATTR_HIDDEN) { - const struct gsm_power_ctrl_params *params; struct lchan_power_ctrl_state *state; const char **args = argv + 4; struct gsm_lchan *lchan; @@ -2615,18 +2614,15 @@ return CMD_WARNING; } - if (strcmp(args[0], "bs-power-ctrl") == 0) { - params = &lchan->bs_dpc_params; + if (strcmp(args[0], "bs-power-ctrl") == 0) state = &lchan->bs_power_ctrl; - } else { /* ms-power-ctrl */ - params = &lchan->ms_dpc_params; + else/* ms-power-ctrl */ state = &lchan->ms_power_ctrl; - } if (strcmp(args[1], "dynamic") == 0) - state->dpc_params = params; + state->dpc_enabled = true; else - state->dpc_params = NULL; + state->dpc_enabled = false; return CMD_SUCCESS; } diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 8fbdcee..c01aa5f 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -106,9 +106,9 @@ g_bts->c0 = g_trx; /* Init defaultBS power control parameters, enable dynamic power control */ - struct gsm_power_ctrl_params *params = &g_trx->ts[0].lchan[0].bs_dpc_params; - g_trx->ts[0].lchan[0].bs_power_ctrl.dpc_params = params; + struct gsm_power_ctrl_params *params = &g_trx->ts[0].lchan[0].bs_power_ctrl.dpc_params; *params = power_ctrl_params_def; + g_trx->ts[0].lchan[0].bs_power_ctrl.dpc_enabled = true; /* Disable loop SACCH block skip by default: */ params->ctrl_interval = 0; @@ -146,30 +146,31 @@ case PWR_TEST_ST_SET_STATE: printf("#%02u %s() <- State (re)set (current %u dB, max %u dB)\n", n, __func__, step->state.current, step->state.max); - lchan->bs_power_ctrl = step->state; - lchan->bs_power_ctrl.dpc_params = &lchan->bs_dpc_params; + lchan->bs_power_ctrl.current = step->state.current; + lchan->bs_power_ctrl.max = step->state.max; + lchan->bs_power_ctrl.dpc_enabled = true; return 0; /* we're done */ case PWR_TEST_ST_DISABLE_DPC: printf("#%02u %s() <- Dynamic power control is disabled\n", n, __func__); - lchan->bs_power_ctrl.dpc_params = NULL; + lchan->bs_power_ctrl.dpc_enabled = false; return 0; /* we're done */ case PWR_TEST_ST_SET_CTRL_INTERVAL: printf("#%02u %s() <- (Re)set power control interval: %u -> %u\n", - n, __func__, lchan->bs_dpc_params.ctrl_interval, step->ctrl_interval); - lchan->bs_dpc_params.ctrl_interval = step->ctrl_interval; + n, __func__, lchan->bs_power_ctrl.dpc_params.ctrl_interval, step->ctrl_interval); + lchan->bs_power_ctrl.dpc_params.ctrl_interval = step->ctrl_interval; return 0; /* we're done */ case PWR_TEST_ST_SET_STEP_SIZE: printf("#%02u %s() <- Set step size: inc %u dB, red %u dB\n", n, __func__, step->step_size.inc, step->step_size.red); - lchan->bs_dpc_params.inc_step_size_db = step->step_size.inc; - lchan->bs_dpc_params.red_step_size_db = step->step_size.red; + lchan->bs_power_ctrl.dpc_params.inc_step_size_db = step->step_size.inc; + lchan->bs_power_ctrl.dpc_params.red_step_size_db = step->step_size.red; return 0; /* we're done */ case PWR_TEST_ST_SET_RXLEV_PARAMS: printf("#%02u %s() <- (Re)set RxLev params (thresh %u .. %u, " "averaging is %sabled)\n", n, __func__, step->mp.lower_thresh, step->mp.upper_thresh, step->mp.algo != GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE ? "en" : "dis"); - lchan->bs_dpc_params.rxlev_meas = step->mp; + lchan->bs_power_ctrl.dpc_params.rxlev_meas = step->mp; return 0; /* we're done */ case PWR_TEST_ST_ENABLE_DTXD: printf("#%02u %s() <- Enable DTXd\n", n, __func__); @@ -204,7 +205,7 @@ init_test(name); struct gsm_lchan *lchan = &g_trx->ts[0].lchan[0]; - struct gsm_power_ctrl_params *params = &lchan->bs_dpc_params; + struct gsm_power_ctrl_params *params = &lchan->bs_power_ctrl.dpc_params; /* No RxLev hysteresis: lower == upper */ params->rxlev_meas.lower_thresh = PWR_TEST_RXLEV_TARGET; diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index 47df68e..55a70ed 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -55,9 +55,9 @@ g_bts->c0 = g_trx; /* Init default MS power control parameters, enable dynamic power control */ - struct gsm_power_ctrl_params *params = &g_trx->ts[0].lchan[0].ms_dpc_params; - g_trx->ts[0].lchan[0].ms_power_ctrl.dpc_params = params; + struct gsm_power_ctrl_params *params = &g_trx->ts[0].lchan[0].ms_power_ctrl.dpc_params; *params = power_ctrl_params_def; + g_trx->ts[0].lchan[0].ms_power_ctrl.dpc_enabled = true; /* Disable loop SACCH block skip by default: */ params->ctrl_interval = 0; @@ -98,7 +98,7 @@ init_test(__func__); lchan = &g_trx->ts[0].lchan[0]; - params = lchan->ms_power_ctrl.dpc_params; + params = &lchan->ms_power_ctrl.dpc_params; lchan->type = GSM_LCHAN_SDCCH; good_lqual = (params->ci_sdcch_meas.lower_thresh + 2) * 10; @@ -160,11 +160,11 @@ OSMO_ASSERT(lchan->ms_power_ctrl.max == 0); /* Disable dynamic power control and jump down */ - lchan->ms_power_ctrl.dpc_params = NULL; + lchan->ms_power_ctrl.dpc_enabled = false; apply_power_test(lchan, -60, good_lqual, 0, 14); /* Enable and leave it again */ - lchan->ms_power_ctrl.dpc_params = &lchan->ms_dpc_params; + lchan->ms_power_ctrl.dpc_enabled = true; apply_power_test(lchan, -40, good_lqual, 1, 15); } @@ -178,11 +178,11 @@ init_test(__func__); lchan = &g_trx->ts[0].lchan[0]; lchan->type = GSM_LCHAN_SDCCH; - params = lchan->ms_power_ctrl.dpc_params; + params = &lchan->ms_power_ctrl.dpc_params; good_lqual = (params->ci_sdcch_meas.lower_thresh + 2) * 10; avg100 = &lchan->ms_power_ctrl.rxlev_meas_proc.ewma.Avg100; - struct gsm_power_ctrl_meas_params *mp = &lchan->ms_dpc_params.rxlev_meas; + struct gsm_power_ctrl_meas_params *mp = &lchan->ms_power_ctrl.dpc_params.rxlev_meas; mp->algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA; mp->ewma.alpha = 20; /* 80% smoothing */ @@ -238,18 +238,18 @@ static void test_power_hysteresis(void) { struct gsm_lchan *lchan; - const struct gsm_power_ctrl_params *params; + struct gsm_power_ctrl_params *params; int16_t good_lqual; init_test(__func__); lchan = &g_trx->ts[0].lchan[0]; lchan->type = GSM_LCHAN_SDCCH; - params = lchan->ms_power_ctrl.dpc_params; + params = &lchan->ms_power_ctrl.dpc_params; good_lqual = (params->ci_sdcch_meas.lower_thresh + 2) * 10; /* Tolerate power deviations in range -80 .. -70 */ - lchan->ms_dpc_params.rxlev_meas.lower_thresh = 30; - lchan->ms_dpc_params.rxlev_meas.upper_thresh = 40; + params->rxlev_meas.lower_thresh = 30; + params->rxlev_meas.upper_thresh = 40; lchan->ms_power_ctrl.current = ms_pwr_ctl_lvl(GSM_BAND_1800, 0); OSMO_ASSERT(lchan->ms_power_ctrl.current == 15); @@ -277,7 +277,7 @@ init_test(__func__); lchan = &g_trx->ts[0].lchan[0]; lchan->type = GSM_LCHAN_SDCCH; - params = lchan->ms_power_ctrl.dpc_params; + params = &lchan->ms_power_ctrl.dpc_params; good_lqual = (params->ci_sdcch_meas.lower_thresh + 2) * 10; lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 26); @@ -325,7 +325,7 @@ /* Set the corresponding power control interval */ printf("%s(): power control interval is now %u\n", __func__, i); - lchan->ms_dpc_params.ctrl_interval = i; + lchan->ms_power_ctrl.dpc_params.ctrl_interval = i; for (j = 0; j < ARRAY_SIZE(script[i]); j++) { apply_power_test(lchan, script[i][j][0], /* UL RxLev */ @@ -346,7 +346,7 @@ init_test(__func__); lchan = &g_trx->ts[0].lchan[0]; - params = lchan->ms_power_ctrl.dpc_params; + params = &lchan->ms_power_ctrl.dpc_params; lchan->type = GSM_LCHAN_SDCCH; good_lqual = (params->ci_sdcch_meas.lower_thresh + 2) * 10; too_low_lqual = (params->ci_sdcch_meas.lower_thresh - 1) * 10; @@ -383,14 +383,14 @@ static void test_good_threshold_convergence(void) { struct gsm_lchan *lchan; - const struct gsm_power_ctrl_params *params; + struct gsm_power_ctrl_params *params; int16_t good_lqual, good_rxlev; init_test(__func__); lchan = &g_trx->ts[0].lchan[0]; - params = lchan->ms_power_ctrl.dpc_params; - lchan->ms_dpc_params.rxlev_meas.upper_thresh = 37; - lchan->ms_dpc_params.rxlev_meas.lower_thresh = 30; + params = &lchan->ms_power_ctrl.dpc_params; + params->rxlev_meas.upper_thresh = 37; + params->rxlev_meas.lower_thresh = 30; lchan->type = GSM_LCHAN_SDCCH; good_lqual = (params->ci_sdcch_meas.lower_thresh + 2) * 10; good_rxlev = rxlev2dbm(params->rxlev_meas.lower_thresh + 2); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41807?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0e2a6c2c33e0ac9a0bc1734d83eaeafc27f2f4df Gerrit-Change-Number: 41807 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(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>

1 0

[M] Change in osmo-bts[master]: {bs,ms}_power_control: Move params inside lchan_power_ctrl_state
by pespin 19 Jan '26

19 Jan '26

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/41807?usp=email ) Change subject: {bs,ms}_power_control: Move params inside lchan_power_ctrl_state ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/41807?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0e2a6c2c33e0ac9a0bc1734d83eaeafc27f2f4df Gerrit-Change-Number: 41807 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Jan 2026 12:06:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: gmstap_log: optimization: Add talloc_pool for transmitted messages
by pespin 19 Jan '26

19 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41865?usp=email ) Change subject: gmstap_log: optimization: Add talloc_pool for transmitted messages ...................................................................... gmstap_log: optimization: Add talloc_pool for transmitted messages In synchronous modes (blocking and non-blocking), set a pool size of 1 msgb. This way we avoid re-allocating the msgb with malloc/free everytime a gsmtap_log msg is transmitted over the target, and instead we allocate the msgb during creation of the target. In asynchronous mode (workqueue), create a pool of 100 msgbs, which should in general be enough to speedup more usual needs. If more than 100 msgbs are to be enqueued into the gsmtap_inst, then they will be allocated as normal talloc contexts. Since the struct log_target is public, it is currently not possible to add new fields to it under "tgt_gsmtap" without breaking the ABI. Hence, the ->output field, which is unused in this target, is reused to store the pool object internally. Change-Id: I19cdf09f21d856e8e3646de495ce7ae040195268 --- M configure.ac M src/core/logging_gsmtap.c 2 files changed, 34 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 565d392..b0914f7 100644 --- a/configure.ac +++ b/configure.ac @@ -455,6 +455,9 @@ )], [enable_pseudotalloc=$enableval], [enable_pseudotalloc=$ENABLE_PSEUDOTALLOC_DEFAULT]) AM_CONDITIONAL(ENABLE_PSEUDOTALLOC, test x"$enable_pseudotalloc" = x"yes") +AS_IF([test "x$enable_pseudotalloc" = "xyes"], [ + AC_DEFINE([ENABLE_PSEUDOTALLOC], [1], [Enable building pseudotalloc library]) +]) AC_ARG_ENABLE(log_macros, [AS_HELP_STRING( diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index 7775c27..062efd9 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -50,6 +50,9 @@ #include <osmocom/core/thread.h> #define GSMTAP_LOG_MAX_SIZE 4096 +#define GSMTAP_MSG_MAX_SIZE (sizeof(struct gsmtap_hdr) + \ + sizeof(struct gsmtap_osmocore_log_hdr) + \ + GSMTAP_LOG_MAX_SIZE) static __thread uint32_t logging_gsmtap_tid; @@ -70,8 +73,8 @@ /* get timestamp ASAP */ osmo_gettimeofday(&tv, NULL); - msg = msgb_alloc(sizeof(*gh)+sizeof(*golh)+GSMTAP_LOG_MAX_SIZE, - "GSMTAP logging"); + + msg = msgb_alloc_c((void *)target->output, GSMTAP_MSG_MAX_SIZE, "GSMTAP logging"); /* GSMTAP header */ gh = (struct gsmtap_hdr *) msgb_put(msg, sizeof(*gh)); @@ -150,6 +153,32 @@ return NULL; } +#ifndef ENABLE_PSEUDOTALLOC + size_t num_pool_objects; + if (ofd_wq_mode) { + /* Allocate a talloc pool to avoid malloc() on the first 100 + * concurrently queued msgbs (~400KB per gsmtap_log target). + * Once the talloc_pool is full, new normal talloc chunks will be used. */ + num_pool_objects = 100; + } else { + /* When in synchronous mode (blocking & non-blocking), there's + * no queueing in gsmtap_sendmsg() so there's no need to have a + * pool with multiple msgbs. */ + num_pool_objects = 1; + } + /* XXX: Abuse "output" field to store the talloc_pool, since it's not + * used in gsmtap log target. This can be moved to its own field once we + * make "struct log_target" private. + */ + target->output = _talloc_pooled_object(target, 0, "gsmtap_log_msgb_pool", + num_pool_objects, + (sizeof(struct msgb) + GSMTAP_MSG_MAX_SIZE) * num_pool_objects); +#else + /* talloc pools not supported by pseudotalloc, allocate on usual msgb ctx instead: */ + extern void *tall_msgb_ctx; + target->output = tall_msgb_ctx; +#endif /* ifndef ENABLE_PSEUDOTALLOC */ + if (add_sink) gsmtap_source_add_sink(gti); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41865?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: I19cdf09f21d856e8e3646de495ce7ae040195268 Gerrit-Change-Number: 41865 Gerrit-PatchSet: 7 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: select.c: Check for ENABLE_PSEUDOTALLOC instead of EMBEDDED
by pespin 19 Jan '26

19 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41869?usp=email ) Change subject: select.c: Check for ENABLE_PSEUDOTALLOC instead of EMBEDDED ...................................................................... select.c: Check for ENABLE_PSEUDOTALLOC instead of EMBEDDED The reason to avoid that code is that pseudotalloc doesn't implement that function. Hence check for pseudotalloc support specifically. Change-Id: I9c4aa66a55beac710912db9b8d3ad9ae5c1679ef --- M src/core/select.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/select.c b/src/core/select.c index 267f041..a577c5b 100644 --- a/src/core/select.c +++ b/src/core/select.c @@ -509,12 +509,12 @@ int osmo_select_main(int polling) { int rc = _osmo_select_main(polling); -#ifndef EMBEDDED +#ifndef ENABLE_PSEUDOTALLOC if (talloc_total_size(osmo_ctx->select) != 0) { osmo_panic("You cannot use the 'select' volatile " "context if you don't use osmo_select_main_ctx()!\n"); } -#endif +#endif /* ifndef ENABLE_PSEUDOTALLOC */ return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41869?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: I9c4aa66a55beac710912db9b8d3ad9ae5c1679ef Gerrit-Change-Number: 41869 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 0

[M] Change in libosmocore[master]: configure.ac: EMBEDDED modifies default AC_ARG_ENABLE values
by pespin 19 Jan '26

19 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41867?usp=email ) Change subject: configure.ac: EMBEDDED modifies default AC_ARG_ENABLE values ...................................................................... configure.ac: EMBEDDED modifies default AC_ARG_ENABLE values With this patch, EMBEDDED simply modifies the default enable/disable configure args, as in a preset, instead of changing state after checks have been done. This way the logic is clarified since the same logic in configure is always checked, regardless of EMBEDDED being set or not. Change-Id: I164eb461fb59c7675393219102740f40c1119fdd --- M configure.ac 1 file changed, 89 insertions(+), 77 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index aa3e251..565d392 100644 --- a/configure.ac +++ b/configure.ac @@ -187,13 +187,69 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.1.0]) +ENABLE_URING_DEFAULT="yes" +ENABLE_PCSC_DEFAULT="yes" +ENABLE_LIBUSB_DEFAULT="yes" +ENABLE_GNUTLS_DEFAULT="yes" +ENABLE_SYSLOG_LOGGING_DEFAULT="yes" +ENABLE_SYSTEMD_LOGGING_DEFAULT="no" +ENABLE_LIBMNL_DEFAULT="yes" +ENABLE_LIBSCTP_DEFAULT="yes" +ENABLE_SCTP_TESTS_DEFAULT="yes" +ENABLE_URING_TESTS_DEFAULT="yes" +ENABLE_PLUGIN_DEFAULT="yes" +ENABLE_VTY_DEFAULT="yes" +ENABLE_PANIC_INFLOOP_DEFAULT="no" +ENABLE_OSMO_FD_CHECK_DEFAULT="no" +ENABLE_FORCE_IO_SELECT_DEFAULT="no" +ENABLE_MSGFILE_DEFAULT="yes" +ENABLE_SERIAL_DEFAULT="yes" +ENABLE_UTILITIES_DEFAULT="yes" +ENABLE_GB_DEFAULT="yes" +ENABLE_CTRL_DEFAULT="yes" +ENABLE_PSEUDOTALLOC_DEFAULT="no" +ENABLE_EMBEDDED_DEFAULT="no" +ENABLE_LIBOSMOCORE_NO_LOGGING_DEFAULT="no" +ENABLE_SANITIZE_DEFAULT="no" +ENABLE_WERROR_DEFAULT="no" +ENABLE_EXT_TESTS_DEFAULT="no" +ENABLE_SIMD_SUPPORT_DEFAULT="yes" +ENABLE_NEON_SUPPORT_DEFAULT="no" +ENABLE_SYSTEMTAP_DEFAULT="no" + +AC_ARG_ENABLE(embedded, + [AS_HELP_STRING( + [--enable-embedded], + [Enable building for embedded use and disable unsupported features] + )], + [embedded=$enableval], [embedded=$ENABLE_EMBEDDED_DEFAULT]) +AM_CONDITIONAL(EMBEDDED, test x"$embedded" = x"yes") +AM_CONDITIONAL(ENABLE_SERCOM_STUB, test x"$embedded" = x"yes") + +if test x"$embedded" = x"yes" +then + AC_DEFINE([EMBEDDED],[1],[Select building for embedded use]) + ENABLE_PLUGIN_DEFAULT="no" + ENABLE_MSGFILE_DEFAULT="no" + ENABLE_SERIAL_DEFAULT="no" + ENABLE_GNUTLS_DEFAULT="no" + ENABLE_VTY_DEFAULT="no" + ENABLE_CTRL_DEFAULT="no" + ENABLE_UTILITIES_DEFAULT="no" + ENABLE_GB_DEFAULT="no" + ENABLE_LIBMNL_DEFAULT="no" + ENABLE_LIBSCTP_DEFAULT="no" + ENABLE_LIBUSB_DEFAULT="no" + ENABLE_PCSC_DEFAULT="no" + ENABLE_URING_DEFAULT="no" + ENABLE_PSEUDOTALLOC_DEFAULT="yes" + ENABLE_SYSLOG_LOGGING_DEFAULT="no" + ENABLE_PANIC_INFLOOP_DEFAULT="yes" + ENABLE_GNUTLS_DEFAULT="no" +fi + AC_ARG_ENABLE([uring], [AS_HELP_STRING([--disable-uring], [Build without io_uring support])], - [ - ENABLE_URING=$enableval - ], - [ - ENABLE_URING="yes" - ]) + [ENABLE_URING=$enableval], [ENABLE_URING=$ENABLE_URING_DEFAULT]) AS_IF([test "x$ENABLE_URING" = "xyes"], [ PKG_CHECK_MODULES(URING, [liburing >= 0.7]) AC_DEFINE([HAVE_URING],[1],[Build with io_uring support]) @@ -202,12 +258,7 @@ AC_SUBST(ENABLE_URING) AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC support])], - [ - ENABLE_PCSC=$enableval - ], - [ - ENABLE_PCSC="yes" - ]) + [ENABLE_PCSC=$enableval], [ENABLE_PCSC=$ENABLE_PCSC_DEFAULT]) AS_IF([test "x$ENABLE_PCSC" = "xyes"], [ PKG_CHECK_MODULES(PCSC, libpcsclite) AC_DEFINE([HAVE_PCSC],[1],[Build with PC/SC support]) @@ -216,12 +267,7 @@ AC_SUBST(ENABLE_PCSC) AC_ARG_ENABLE([libusb], [AS_HELP_STRING([--disable-libusb], [Build without libusb support])], - [ - ENABLE_LIBUSB=$enableval - ], - [ - ENABLE_LIBUSB="yes" - ]) + [ENABLE_LIBUSB=$enableval], [ENABLE_LIBUSB=$ENABLE_LIBUSB_DEFAULT]) AS_IF([test "x$ENABLE_LIBUSB" = "xyes"], [ PKG_CHECK_MODULES(LIBUSB, libusb-1.0) ]) @@ -229,7 +275,7 @@ AC_SUBST(ENABLE_LIBUSB) AC_ARG_ENABLE([gnutls], [AS_HELP_STRING([--disable-gnutls], [Do not use GnuTLS fallback for missing getrandom()])], - [ENABLE_GNUTLS=$enableval], [ENABLE_GNUTLS="yes"]) + [ENABLE_GNUTLS=$enableval], [ENABLE_GNUTLS=$ENABLE_GNUTLS_DEFAULT]) AM_CONDITIONAL(ENABLE_GNUTLS, test x"$ENABLE_GNUTLS" = x"yes") AS_IF([test "x$ENABLE_GNUTLS" = "xyes"], [ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.12.0]) @@ -247,7 +293,7 @@ [--disable-syslog-logging], [Build without syslog logging support] )], - [syslog_logging=$enableval], [syslog_logging="yes"]) + [syslog_logging=$enableval], [syslog_logging=$ENABLE_SYSLOG_LOGGING_DEFAULT]) AS_IF([test "x$syslog_logging" = "xyes"], [ AC_CHECK_HEADER([syslog.h], [SYSLOG_H_FOUND='yes'], [SYSLOG_H_FOUND='no'; @@ -262,7 +308,7 @@ [--enable-systemd-logging], [Build with systemd-journal logging support] )], - [systemd_logging=$enableval], [systemd_logging="no"]) + [systemd_logging=$enableval], [systemd_logging=$ENABLE_SYSTEMD_LOGGING_DEFAULT]) AS_IF([test "x$systemd_logging" = "xyes"], [ PKG_CHECK_MODULES(SYSTEMD, libsystemd) AC_DEFINE([ENABLE_SYSTEMD_LOGGING], [1], [Enable systemd-journal logging target]) @@ -275,7 +321,7 @@ [--disable-libmnl], [Build without netlink socket support via libmnl] )], - [mnl=$enableval], [mnl="yes"]) + [mnl=$enableval], [mnl=$ENABLE_LIBMNL_DEFAULT]) AS_IF([test "x$mnl" = "xyes"], [ PKG_CHECK_MODULES(LIBMNL, libmnl, [AC_SUBST(LIBMNL_PC, [libmnl])]) AC_DEFINE([ENABLE_LIBMNL], [1], [Enable netlink socket support via libmnl]) @@ -284,7 +330,7 @@ AC_SUBST(ENABLE_LIBMNL) AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], - [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) + [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP=$ENABLE_LIBSCTP_DEFAULT]) AM_CONDITIONAL(ENABLE_LIBSCTP, test x"$ENABLE_LIBSCTP" = x"yes") AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"], [ AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) @@ -306,11 +352,11 @@ ]) AC_ARG_ENABLE([sctp-tests], [AS_HELP_STRING([--disable-sctp-tests], [Do not run socket tests requiring system SCTP support])], - [ENABLE_SCTP_TESTS=$enableval], [ENABLE_SCTP_TESTS="yes"]) + [ENABLE_SCTP_TESTS=$enableval], [ENABLE_SCTP_TESTS=$ENABLE_SCTP_TESTS_DEFAULT]) AM_CONDITIONAL(ENABLE_SCTP_TESTS, test x"$ENABLE_SCTP_TESTS" = x"yes") AC_ARG_ENABLE([uring-tests], [AS_HELP_STRING([--disable-uring-tests], [Do not run io_uring tests])], - [ENABLE_URING_TESTS=$enableval], [ENABLE_URING_TESTS="yes"]) + [ENABLE_URING_TESTS=$enableval], [ENABLE_URING_TESTS=$ENABLE_URING_TESTS_DEFAULT]) AM_CONDITIONAL(ENABLE_URING_TESTS, test x"$ENABLE_URING_TESTS" = x"yes") AC_SUBST(ENABLE_URING_TESTS) @@ -319,7 +365,7 @@ [--disable-plugin], [Disable support for dlopen plugins], )], - [enable_plugin=$enableval], [enable_plugin="yes"]) + [enable_plugin=$enableval], [enable_plugin=$ENABLE_PLUGIN_DEFAULT]) AM_CONDITIONAL(ENABLE_PLUGIN, test x"$enable_plugin" = x"yes") AC_ARG_ENABLE(vty, @@ -327,7 +373,7 @@ [--disable-vty], [Disable building VTY telnet interface] )], - [enable_vty=$enableval], [enable_vty="yes"]) + [enable_vty=$enableval], [enable_vty=$ENABLE_VTY_DEFAULT]) AM_CONDITIONAL(ENABLE_VTY, test x"$enable_vty" = x"yes") AC_ARG_ENABLE(panic_infloop, @@ -335,7 +381,7 @@ [--enable-panic-infloop], [Trigger infinite loop on panic rather than fprintf/abort] )], - [panic_infloop=$enableval], [panic_infloop="no"]) + [panic_infloop=$enableval], [panic_infloop=$ENABLE_PANIC_INFLOOP_DEFAULT]) if test x"$panic_infloop" = x"yes" then AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort]) @@ -346,7 +392,7 @@ [--enable-ofd-check], [Instrument osmo_fd_register to check that the fd is registered] )], - [fd_check=$enableval], [fd_check="no"]) + [fd_check=$enableval], [fd_check=$ENABLE_OSMO_FD_CHECK_DEFAULT]) if test x"$fd_check" = x"yes" then AC_DEFINE([OSMO_FD_CHECK], [1], [Instrument the osmo_fd_register]) @@ -357,7 +403,7 @@ [--enable-force-io-select], [Build with old select I/O instead of poll] )], - [force_io_select=$enableval], [force_io_select="no"]) + [force_io_select=$enableval], [force_io_select=$ENABLE_FORCE_IO_SELECT_DEFAULT]) AS_IF([test "x$force_io_select" = "xyes"], [ AC_DEFINE([FORCE_IO_SELECT], [1], [Force the use of select() instead of poll()]) ]) @@ -367,7 +413,7 @@ [--disable-msgfile], [Disable support for the msgfile], )], - [enable_msgfile=$enableval], [enable_msgfile="yes"]) + [enable_msgfile=$enableval], [enable_msgfile=$ENABLE_MSGFILE_DEFAULT]) AM_CONDITIONAL(ENABLE_MSGFILE, test x"$enable_msgfile" = x"yes") AC_ARG_ENABLE(serial, @@ -375,7 +421,7 @@ [--disable-serial], [Disable support for the serial helpers], )], - [enable_serial=$enableval], [enable_serial="yes"]) + [enable_serial=$enableval], [enable_serial=$ENABLE_SERIAL_DEFAULT]) AM_CONDITIONAL(ENABLE_SERIAL, test x"$enable_serial" = x"yes") AC_ARG_ENABLE(utilities, @@ -383,7 +429,7 @@ [--disable-utilities], [Disable building utility programs], )], - [enable_utilities=$enableval], [enable_utilities="yes"]) + [enable_utilities=$enableval], [enable_utilities=$ENABLE_UTILITIES_DEFAULT]) AM_CONDITIONAL(ENABLE_UTILITIES, test x"$enable_utilities" = x"yes") AC_ARG_ENABLE(gb, @@ -391,7 +437,7 @@ [--disable-gb], [Disable building Gb library], )], - [enable_gb=$enableval], [enable_gb="yes"]) + [enable_gb=$enableval], [enable_gb=$ENABLE_GB_DEFAULT]) AM_CONDITIONAL(ENABLE_GB, test x"$enable_gb" = x"yes") AC_ARG_ENABLE(ctrl, @@ -399,7 +445,7 @@ [--disable-ctrl], [Disable building CTRL library], )], - [enable_ctrl=$enableval], [enable_ctrl="yes"]) + [enable_ctrl=$enableval], [enable_ctrl=$ENABLE_CTRL_DEFAULT]) AM_CONDITIONAL(ENABLE_CTRL, test x"$enable_ctrl" = x"yes") AC_ARG_ENABLE(pseudotalloc, @@ -407,49 +453,15 @@ [--enable-pseudotalloc], [Enable building pseudotalloc library], )], - [enable_pseudotalloc=$enableval], [enable_pseudotalloc="no"]) + [enable_pseudotalloc=$enableval], [enable_pseudotalloc=$ENABLE_PSEUDOTALLOC_DEFAULT]) AM_CONDITIONAL(ENABLE_PSEUDOTALLOC, test x"$enable_pseudotalloc" = x"yes") -AC_ARG_ENABLE(embedded, - [AS_HELP_STRING( - [--enable-embedded], - [Enable building for embedded use and disable unsupported features] - )], - [embedded=$enableval], [embedded="no"]) - -AM_CONDITIONAL(EMBEDDED, false) -AM_CONDITIONAL(ENABLE_SERCOM_STUB, false) - -if test x"$embedded" = x"yes" -then - AC_DEFINE([EMBEDDED],[1],[Select building for embedded use]) - AM_CONDITIONAL(ENABLE_PLUGIN, false) - AM_CONDITIONAL(ENABLE_MSGFILE, false) - AM_CONDITIONAL(ENABLE_SERIAL, false) - AM_CONDITIONAL(ENABLE_GNUTLS, false) - AM_CONDITIONAL(ENABLE_VTY, false) - AM_CONDITIONAL(ENABLE_CTRL, false) - AM_CONDITIONAL(ENABLE_UTILITIES, false) - AM_CONDITIONAL(ENABLE_GB, false) - AM_CONDITIONAL(ENABLE_LIBMNL, false) - AM_CONDITIONAL(ENABLE_LIBSCTP, false) - AM_CONDITIONAL(ENABLE_LIBUSB, false) - AM_CONDITIONAL(ENABLE_PCSC, false) - AM_CONDITIONAL(ENABLE_URING, false) - AM_CONDITIONAL(ENABLE_PSEUDOTALLOC, true) - AM_CONDITIONAL(ENABLE_SERCOM_STUB, true) - AM_CONDITIONAL(ENABLE_SYSLOG_LOGGING, false) - AM_CONDITIONAL(EMBEDDED, true) - AC_DEFINE([USE_GNUTLS], [0]) - AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort]) -fi - AC_ARG_ENABLE(log_macros, [AS_HELP_STRING( [--disable-log-macros], [Disable logging macros that are also used internally to print information] )], - [log_macros="yes"], [log_macros="no"]) + [log_macros=$enableval], [log_macros=$ENABLE_LIBOSMOCORE_NO_LOGGING_DEFAULT]) if test x"$log_macros" == x"yes" then AC_DEFINE([LIBOSMOCORE_NO_LOGGING],[1],[Disable logging macros]) @@ -460,7 +472,7 @@ [--enable-sanitize], [Compile with address sanitizer enabled], )], - [sanitize=$enableval], [sanitize="no"]) + [sanitize=$enableval], [sanitize=$ENABLE_SANITIZE_DEFAULT]) if test x"$sanitize" = x"yes" then CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" @@ -475,7 +487,7 @@ b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) ] )], - [werror=$enableval], [werror="no"]) + [werror=$enableval], [werror=$ENABLE_WERROR_DEFAULT]) if test x"$werror" = x"yes" then WERROR_FLAGS="-Werror" @@ -489,7 +501,7 @@ AC_ARG_ENABLE([external_tests], AC_HELP_STRING([--enable-external-tests], [Include the VTY/CTRL tests in make check [default=no]]), - [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) + [enable_ext_tests="$enableval"],[enable_ext_tests=$ENABLE_EXT_TESTS_DEFAULT]) if test "x$enable_ext_tests" = "xyes" ; then AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then @@ -508,7 +520,7 @@ [--disable-simd], [Disable SIMD support] )], - [simd=$enableval], [simd="yes"]) + [simd=$enableval], [simd=$ENABLE_SIMD_SUPPORT_DEFAULT]) if test x"$simd" = x"yes" then # Find and define supported SIMD extensions @@ -524,7 +536,7 @@ [--enable-neon], [Enable ARM NEON instructions support [default=no]] )], - [neon=$enableval], [neon="no"]) + [neon=$enableval], [neon=$ENABLE_NEON_SUPPORT_DEFAULT]) AS_IF([test "x$neon" = "xyes"], [ AC_DEFINE([HAVE_NEON],, [Support ARM NEON instructions]) ]) @@ -539,7 +551,7 @@ AC_ARG_ENABLE([systemtap], [AS_HELP_STRING([--enable-systemtap], [Enable inclusion of systemtap trace support])], - [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no']) + [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP=$ENABLE_SYSTEMTAP_DEFAULT]) AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41867?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: I164eb461fb59c7675393219102740f40c1119fdd Gerrit-Change-Number: 41867 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: select.c: Check for ENABLE_PLUGIN instead of EMBEDDED
by pespin 19 Jan '26

19 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41870?usp=email ) Change subject: select.c: Check for ENABLE_PLUGIN instead of EMBEDDED ...................................................................... select.c: Check for ENABLE_PLUGIN instead of EMBEDDED Change-Id: I6cae7781a94e4eb6daaf97c16638fd933a3c9123 --- M configure.ac M src/gsm/auth_core.c M src/gsm/gprs_cipher_core.c 3 files changed, 8 insertions(+), 9 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index b0914f7..64690f9 100644 --- a/configure.ac +++ b/configure.ac @@ -360,13 +360,12 @@ AM_CONDITIONAL(ENABLE_URING_TESTS, test x"$ENABLE_URING_TESTS" = x"yes") AC_SUBST(ENABLE_URING_TESTS) -AC_ARG_ENABLE(plugin, - [AS_HELP_STRING( - [--disable-plugin], - [Disable support for dlopen plugins], - )], +AC_ARG_ENABLE(plugin, [AS_HELP_STRING([--disable-plugin], [Disable support for dlopen plugins],)], [enable_plugin=$enableval], [enable_plugin=$ENABLE_PLUGIN_DEFAULT]) AM_CONDITIONAL(ENABLE_PLUGIN, test x"$enable_plugin" = x"yes") +AS_IF([test "x$enable_plugin" = "xyes"], [ + AC_DEFINE([ENABLE_PLUGIN], [1], [Enable support for dlopen plugins]) +]) AC_ARG_ENABLE(vty, [AS_HELP_STRING( diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c index 6972cb7..80bf7c8 100644 --- a/src/gsm/auth_core.c +++ b/src/gsm/auth_core.c @@ -98,11 +98,11 @@ int osmo_auth_load(const char *path) { /* load all plugins available from path */ -#if !defined(EMBEDDED) +#ifdef ENABLE_PLUGIN return osmo_plugin_load_all(path); #else return -1; -#endif +#endif /* ifdef ENABLE_PLUGIN */ } /*! Determine if a given authentication algorithm is supported diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c index 97e581d..5f28084 100644 --- a/src/gsm/gprs_cipher_core.c +++ b/src/gsm/gprs_cipher_core.c @@ -66,11 +66,11 @@ /* load all available GPRS cipher plugins */ int gprs_cipher_load(const char *path) { -#if !defined(EMBEDDED) +#ifdef ENABLE_PLUGIN /* load all plugins available from path */ if (path) return osmo_plugin_load_all(path); -#endif +#endif /* ifdef ENABLE_PLUGIN */ return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41870?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: I6cae7781a94e4eb6daaf97c16638fd933a3c9123 Gerrit-Change-Number: 41870 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026