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

[S] Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: expect altstep timeout entry only if timer is running
by fixeria 30 Jan '24

30 Jan '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35741?usp=email ) Change subject: BSSGP_Emulation: expect altstep timeout entry only if timer is running ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7d1b76a6bc1fc2f0f4896c59673c01293b526e9 Gerrit-Change-Number: 35741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Jan 2024 14:28:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ctrl: Remove unused vty includes
by matanp 30 Jan '24

30 Jan '24

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35744?usp=email ) Change subject: ctrl: Remove unused vty includes ...................................................................... ctrl: Remove unused vty includes Change-Id: Ib464d0be9df839740a648ff6747130c18d33455d --- M src/osmo-bsc/bts_ctrl.c M src/osmo-bsc/bts_trx_ctrl.c 2 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/35744/1 diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 9c14190..eac01bf 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -24,9 +24,6 @@ #include <osmocom/ctrl/control_cmd.h> -#include <osmocom/vty/command.h> -#include <osmocom/vty/misc.h> - #include <osmocom/bsc/ctrl.h> #include <osmocom/bsc/osmo_bsc_rf.h> #include <osmocom/bsc/bts.h> diff --git a/src/osmo-bsc/bts_trx_ctrl.c b/src/osmo-bsc/bts_trx_ctrl.c index ff58cb7..258203c 100644 --- a/src/osmo-bsc/bts_trx_ctrl.c +++ b/src/osmo-bsc/bts_trx_ctrl.c @@ -24,9 +24,6 @@ #include <osmocom/ctrl/control_cmd.h> -#include <osmocom/vty/command.h> -#include <osmocom/vty/misc.h> - #include <osmocom/bsc/ctrl.h> #include <osmocom/bsc/osmo_bsc_rf.h> #include <osmocom/bsc/bts.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib464d0be9df839740a648ff6747130c18d33455d Gerrit-Change-Number: 35744 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by jolly 30 Jan '24

30 Jan '24

jolly has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Prevent poll() in select.c to timeout too early Adjust osmo_timers_nearest_ms() to round up the remaining time. Note that poll() has a granularity of 1 millisecond. Previously, when rounding down the remaining time, osmo_select_main() would return too early, before the nearest timer timed out. Consequently, the main loop repeatedly called osmo_select_main() until the timer actually timed out, resulting in excessive CPU usage. By modifying osmo_timers_nearest_ms() to round up the remaining time, we ensure accurate timeout calculations, preventing unnecessary CPU consumption during the main loop. The patch only applies to non-embedded version of libosmocore, because the impact on embedded systems is not verified tested. Related: OS#6339 Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 --- M src/core/timer.c 1 file changed, 34 insertions(+), 0 deletions(-) Approvals: Hoernchen: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/core/timer.c b/src/core/timer.c index 20d87a0..067bd87 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -191,7 +191,16 @@ return -1; nearest_ms = nearest_p->tv_sec * 1000; +#ifndef EMBEDDED + /* By adding 999 milliseconds, we ensure rounding up to the nearest + * whole millisecond. This approach prevents the return of 0 when the + * timer is still active, and it guarantees that the calling process + * does not wait for a duration shorter than the time remaining on the + * timer. */ + nearest_ms += (nearest_p->tv_usec + 999) / 1000; +#else nearest_ms += nearest_p->tv_usec / 1000; +#endif return nearest_ms; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(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> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by Hoernchen 30 Jan '24

30 Jan '24

Attention is currently required from: fixeria, jolly, pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Jan 2024 11:56:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: expect altstep timeout entry only if timer is running
by pespin 30 Jan '24

30 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35741?usp=email ) Change subject: BSSGP_Emulation: expect altstep timeout entry only if timer is running ...................................................................... BSSGP_Emulation: expect altstep timeout entry only if timer is running Should fix the following log message: BSSGP_Emulation.ttcnpp:1118 Timeout operation on timer g_T1 failed: The timer is not started. Change-Id: Id7d1b76a6bc1fc2f0f4896c59673c01293b526e9 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/35741/1 diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 1b628b3..d01c7a2 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -1115,10 +1115,10 @@ f_ptp_change_state(BVC_S_BLOCKED); } /* Re-transmit BLOCK / UNBLOCK on T1 timeout */ - [not g_t1_waits_for_block_ack] g_T1.timeout { + [g_T1.running and not g_t1_waits_for_block_ack] g_T1.timeout { f_ptp_sendUnblock(); } - [g_t1_waits_for_block_ack] g_T1.timeout { + [g_T1.running and g_t1_waits_for_block_ack] g_T1.timeout { f_ptp_sendBlock(g_last_block_cause); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id7d1b76a6bc1fc2f0f4896c59673c01293b526e9 Gerrit-Change-Number: 35741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP: Fix spare and pdp_type_org fields swapped in PDPAddress IE
by pespin 30 Jan '24

30 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35743?usp=email ) Change subject: GSUP: Fix spare and pdp_type_org fields swapped in PDPAddress IE ...................................................................... GSUP: Fix spare and pdp_type_org fields swapped in PDPAddress IE A recent commit added records to separate 2 binary octets into known fields, but 2 fields filling 1 byte were actually written swapped. Fix it now. Fixes: 7b7a1e8ed16e41d95aed72a15f4ddf1857566b2e Change-Id: I884bddb0e1e5f1cfc5615c11d6c7d602d0df9224 --- M library/GSUP_Templates.ttcn M library/GSUP_Types.ttcn 2 files changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/35743/1 diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 68e4fd1..291b59a 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -61,8 +61,8 @@ template (value) GSUP_PDP_Address ts_GSUP_PDP_Address_IPv4(template (omit) OCT4 ip_addr) := { ipv4 := { - pdp_typeorg := '0001'B, spare := '1111'B, + pdp_typeorg := '0001'B, pdp_typenum := '21'O, ipv4_address := ip_addr } diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 07356f7..0bab1d6 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -207,30 +207,30 @@ other, OTHERWISE;)" }; type record GSUP_PDP_Address_IPv4 { - BIT4 pdp_typeorg, BIT4 spare, + BIT4 pdp_typeorg, OCT1 pdp_typenum, OCT4 ipv4_address optional }; type record GSUP_PDP_Address_IPv6 { - BIT4 pdp_typeorg, - BIT4 spare, + BIT4 spare, + BIT4 pdp_typeorg, OCT1 pdp_typenum, OCT16 ipv6_address optional }; type record GSUP_PDP_Address_IPv4v6 { - BIT4 pdp_typeorg, - BIT4 spare, + BIT4 spare, + BIT4 pdp_typeorg, OCT1 pdp_typenum, OCT4 ipv4_address optional, OCT16 ipv6_address optional }; type record GSUP_PDP_Address_unknown { - BIT4 pdp_typeorg, BIT4 spare, + BIT4 pdp_typeorg, OCT1 pdp_typenum, octetstring addr optional }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35743?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I884bddb0e1e5f1cfc5615c11d6c7d602d0df9224 Gerrit-Change-Number: 35743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: NS_Emulation: expect altstep timeout entry only if timer is running
by pespin 30 Jan '24

30 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35742?usp=email ) Change subject: NS_Emulation: expect altstep timeout entry only if timer is running ...................................................................... NS_Emulation: expect altstep timeout entry only if timer is running Should fix the following log message: NS_Emulation.ttcnpp:784 Timeout operation on timer Tns_alive failed: The timer is not started. Change-Id: If1fae965659f73fde2508b0e9158099025fa65f2 --- M library/NS_Emulation.ttcnpp 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/35742/1 diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index d1700f8..0ed022a 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -781,13 +781,13 @@ } /* transition to DEAD if t_alive times out */ - [] Tns_alive.timeout { + [Tns_alive.running] Tns_alive.timeout { log("Tns-alive expired: changing to DEAD_BLOCKED + starting Tns-test"); f_change_state(NSVC_S_DEAD_BLOCKED); Tns_test.start; } - [] Tns_test.timeout { + [Tns_test.running] Tns_test.timeout { log("Tns-test expired: sending NS-ALIVE"); f_sendAlive(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If1fae965659f73fde2508b0e9158099025fa65f2 Gerrit-Change-Number: 35742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by laforge 30 Jan '24

30 Jan '24

Attention is currently required from: Hoernchen, fixeria, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email ) Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Jan 2024 11:54:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Prevent poll() in select.c to timeout too early
by jolly 30 Jan '24

30 Jan '24

Attention is currently required from: Hoernchen, fixeria, jolly, laforge, pespin. Hello Hoernchen, Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Code-Review+2 by Hoernchen, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: Prevent poll() in select.c to timeout too early ...................................................................... Prevent poll() in select.c to timeout too early Adjust osmo_timers_nearest_ms() to round up the remaining time. Note that poll() has a granularity of 1 millisecond. Previously, when rounding down the remaining time, osmo_select_main() would return too early, before the nearest timer timed out. Consequently, the main loop repeatedly called osmo_select_main() until the timer actually timed out, resulting in excessive CPU usage. By modifying osmo_timers_nearest_ms() to round up the remaining time, we ensure accurate timeout calculations, preventing unnecessary CPU consumption during the main loop. The patch only applies to non-embedded version of libosmocore, because the impact on embedded systems is not verified tested. Related: OS#6339 Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 --- M src/core/timer.c 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/35672/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79de77c79af4d50d1eb9ca0c5417123ff760dca3 Gerrit-Change-Number: 35672 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmocom-bb[master]: mobile: set TRAFFIC.{ind,req} mode during call establishment
by pespin 30 Jan '24

30 Jan '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email ) Change subject: mobile: set TRAFFIC.{ind,req} mode during call establishment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35740?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iab68cb47c28380a9c1efc149c6196ea54f75fdb8 Gerrit-Change-Number: 35740 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Jan 2024 09:39:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0