fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/39831?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: power_control: always feed input values to do_avg_algo()
......................................................................
power_control: always feed input values to do_avg_algo()
The purpose of the power control interval (P_CON_INTERVAL) is to
temporarily suspend the decision-making process of the MS/BS power
control algorithm, allowing time to observe the effects of a
previous adjustment.
However, input value (RxLev/RxQual) averaging must continue
uninterrupted, regardless of the power control interval.
Otherwise we're simply loosing measurement samples.
Change-Id: I2ccad1cb0ebbfcce64a93bc81b66db37b1399769
---
M src/common/power_control.c
1 file changed, 13 insertions(+), 9 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/src/common/power_control.c b/src/common/power_control.c
index 7f98a41..45d8969 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -206,6 +206,12 @@
if (params == NULL)
return 0;
+ /* Average the input RxLev/RxQual samples (if needed). Do this before
+ * the loop suspension logic to keep the pre-processing state updated. */
+ ci_meas = lchan_get_ci_thresholds(lchan);
+ ul_lqual_cb_avg = do_avg_algo(ci_meas, &state->ci_meas_proc, ul_lqual_cb);
+ rxlev_avg = do_avg_algo(¶ms->rxlev_meas, &state->rxlev_meas_proc, dbm2rxlev(ul_rssi_dbm));
+
/* Shall we skip current block based on configured interval? */
if (ctrl_interval_skip_block(params, state))
return 0;
@@ -225,15 +231,10 @@
return 0;
}
- ci_meas = lchan_get_ci_thresholds(lchan);
-
/* Is C/I based algo enabled by config?
* FIXME: this can later be generalized when properly implementing P & N counting. */
ci_on = ci_meas->lower_cmp_n && ci_meas->upper_cmp_n;
- ul_lqual_cb_avg = do_avg_algo(ci_meas, &state->ci_meas_proc, ul_lqual_cb);
- rxlev_avg = do_avg_algo(¶ms->rxlev_meas, &state->rxlev_meas_proc, dbm2rxlev(ul_rssi_dbm));
-
/* If computed C/I is enabled and out of acceptable thresholds: */
if (ci_on && ul_lqual_cb_avg < ci_meas->lower_thresh * 10) {
new_dbm = ms_dbm + params->inc_step_size_db;
@@ -334,10 +335,6 @@
lchan->tch.dtx.dl_active ? "enabled" : "disabled",
lchan->tch.dtx.dl_active ? "SUB" : "FULL");
- /* Shall we skip current block based on configured interval? */
- if (ctrl_interval_skip_block(params, state))
- return 0;
-
/* If DTx is active on Downlink, use the '-SUB' */
if (lchan->tch.dtx.dl_active) {
rxqual = mr->rxqual_sub;
@@ -347,8 +344,15 @@
rxlev = mr->rxlev_full;
}
+ /* Average the input RxLev/RxQual samples (if needed). Do this before
+ * the loop suspension logic to keep the pre-processing state updated. */
rxlev_avg = do_avg_algo(¶ms->rxlev_meas, &state->rxlev_meas_proc, rxlev);
rxqual_avg = do_avg_algo(¶ms->rxqual_meas, &state->rxqual_meas_proc, rxqual);
+
+ /* Shall we skip current block based on configured interval? */
+ if (ctrl_interval_skip_block(params, state))
+ return 0;
+
/* If RxQual > L_RXQUAL_XX_P, try to increase Tx power */
if (rxqual_avg > params->rxqual_meas.lower_thresh) {
/* Increase Tx power by reducing Tx attenuation */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/39831?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: I2ccad1cb0ebbfcce64a93bc81b66db37b1399769
Gerrit-Change-Number: 39831
Gerrit-PatchSet: 2
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: pespin <pespin(a)sysmocom.de>
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-msc/+/39976?usp=email )
Change subject: gsm0911_rcv_nc_ss(): avoid assertion failure in msc_a_put()
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39976?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I724f0f0c9ef8611d3c3653e9370361b252127f72
Gerrit-Change-Number: 39976
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Wed, 16 Apr 2025 11:51:49 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Attention is currently required from: laforge, pespin.
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40019?usp=email )
Change subject: sctp_{client,server}: set sndbuf/recbuf explicitly
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
Patchset:
PS2:
> As stated in the commit message, 65536 is what Erlang/OTP is setting by default for the `SNDBUF`. […]
I am merging this patch as-is for now. We can adjust the defaults in a follow-up patch.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40019?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I66f4a0f6a2441a3c8a4dbd266da8e44a3860b993
Gerrit-Change-Number: 40019
Gerrit-PatchSet: 2
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-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 16 Apr 2025 11:04:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/40042?usp=email )
Change subject: SMS-over-GSUP: properly update MSC_CTR_SMS_RP_ERR_{MEM,OTHER}
......................................................................
SMS-over-GSUP: properly update MSC_CTR_SMS_RP_ERR_{MEM,OTHER}
These counters have not been updated in SMS-over-GSUP mode so far.
Move the logic updating counters to the common code path.
Take a chance to use rate_ctr_inc2().
Change-Id: I97b4699e5b2c44989368004a53e26ca5daaa7b14
Related: SYS#7323
---
M src/libmsc/gsm_04_11.c
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index d45f1ea..fad2f4b 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -918,6 +918,11 @@
LOG_TRANS(trans, LOGL_NOTICE, "RX SMS RP-ERROR, cause %d:%d (%s)\n",
cause_len, cause, get_value_string(gsm411_rp_cause_strs, cause));
+ if (cause == GSM411_RP_CAUSE_MT_MEM_EXCEEDED)
+ rate_ctr_inc2(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_MEM);
+ else
+ rate_ctr_inc2(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_OTHER);
+
if (trans->net->sms_over_gsup) {
/* Forward towards SMSC via GSUP */
uint8_t ui_len = 0;
@@ -957,10 +962,8 @@
* to store this in our database and wait for a SMMA message */
/* FIXME */
send_signal(S_SMS_MEM_EXCEEDED, trans, sms, 0);
- rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_MEM));
} else {
send_signal(S_SMS_UNKNOWN_ERROR, trans, sms, 0);
- rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_RP_ERR_OTHER));
}
sms_free(sms);
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40042?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I97b4699e5b2c44989368004a53e26ca5daaa7b14
Gerrit-Change-Number: 40042
Gerrit-PatchSet: 1
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>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40041?usp=email )
Change subject: ttcn3-bts-test: use an older version of fake_trx.py
......................................................................
ttcn3-bts-test: use an older version of fake_trx.py
The latest version of fake_trx.py [re-]introduces burst queueing [1],
making its behavior more closely resemble that of a real transceiver.
However, this change has also introduced stability issues, leading
to increased flakiness in ttcn3-bts-test.
As a temporary workaround, use an older version predating this change.
Unset the "--sched-rr-prio" [2], which is not supported by that version.
Change-Id: I251082474bb29d0169f88b5bd545c97d487c8353
Related: [1] osmocom-bb.git I41291708effdd2c767be680fff22ffbd9a56815e
Related: [2] 6374a9e ("ttcn3-bts-test: Run fake_trx with sched-prio-rr")
Related: OS#6672
---
M ttcn3-bts-test/Makefile
M ttcn3-bts-test/jenkins.sh
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile
index fc6f3f8..2af27a9 100644
--- a/ttcn3-bts-test/Makefile
+++ b/ttcn3-bts-test/Makefile
@@ -1,3 +1,6 @@
+# XXX: use an older version of fake_trx.py, that predates
+# commit 0f4714776a9c9b64c4a7268eb8a346f304835565 (OS#6672).
+OSMO_BB_BRANCH=ttcn3-bts-test
include ../make/Makefile
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index a25456e..1bb92d8 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -74,7 +74,6 @@
--log-file-level DEBUG \
--log-file-time \
--log-level INFO \
- --sched-rr-prio 30 \
-R $SUB4_PREFIX.$SUBNET.20 \
-r $SUB4_PREFIX.$SUBNET.22 \
--trx TRX1@$SUB4_PREFIX.$SUBNET.20:5700/1 \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40041?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I251082474bb29d0169f88b5bd545c97d487c8353
Gerrit-Change-Number: 40041
Gerrit-PatchSet: 1
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>