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

Build failure of network:osmocom:nightly/libosmo-dsp in openSUSE_Leap_15.1_ARM/aarch64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-dsp failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 96s] build-mkbaselibs-20190128-lp151.1.2 ######################################## [ 96s] fdupes-1.61-lp151.2.3 ######################################## [ 96s] net-tools-deprecated-2.0+git20170221.4######################################## [ 97s] kernel-obs-build-4.12.14-lp151.27.1 ######################################## [ 161s] now finalizing build dir... [ 161s] mktexlsr: Updating /etc/texmf/ls-R... [ 161s] mktexlsr: Updating /var/lib/texmf/main/ls-R... [ 161s] mktexlsr: Updating /var/cache/texmf/fonts/ls-R... [ 161s] mktexlsr: Updating /var/lib/texmf/ls-R... [ 161s] mktexlsr: Done. [ 163s] ----------------------------------------------------------------- [ 163s] I have the following modifications for libosmo-dsp.spec: [ 163s] 12c12 [ 163s] < Release: 0 [ 163s] --- [ 163s] > Release: lp151.1.1 [ 163s] ----------------------------------------------------------------- [ 163s] ----- building libosmo-dsp.spec (user abuild) [ 163s] ----------------------------------------------------------------- [ 163s] ----------------------------------------------------------------- [ 164s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define '_build_create_debug 1' --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Leap_15.1_ARM/29b…' /home/abuild/rpmbuild/SOURCES/libosmo-dsp.spec [ 164s] error: File /home/abuild/rpmbuild/SOURCES/HTML_TIMESTAMP.diff: No such file or directory [ 164s] ### VM INTERACTION START ### [ 164s] [ 151.691477] sysrq: SysRq : Power Off [ 164s] [ 151.692904] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] obs-arm-7 failed "build libosmo-dsp.spec" at Tue Jul 19 00:59:47 UTC 2022. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-dsp in openSUSE_Factory_ARM/aarch64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-dsp failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 154s] mktexlsr: Updating /usr/local/share/texmf... [ 154s] mktexlsr: Updating /usr/share/texmf... [ 154s] mktexlsr: Updating /var/cache/texmf/fonts... [ 154s] mktexlsr: Updating /var/cache/texmf/fonts/texmf... [ 154s] mktexlsr: Updating /var/lib/texmf... [ 154s] mktexlsr: Done. [ 154s] ... running 01-add_abuild_user_to_trusted_group [ 154s] ... running 02-set_timezone_to_utc [ 154s] ... running 03-set-permissions-secure [ 154s] ... running 11-hack_uname_version_to_kernel_version [ 156s] ----------------------------------------------------------------- [ 156s] I have the following modifications for libosmo-dsp.spec: [ 156s] 12c12 [ 156s] < Release: 0 [ 156s] --- [ 156s] > Release: 1.1 [ 156s] ----------------------------------------------------------------- [ 156s] ----- building libosmo-dsp.spec (user abuild) [ 156s] ----------------------------------------------------------------- [ 156s] ----------------------------------------------------------------- [ 156s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define '_build_create_debug 1' --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Factory_ARM/29ba9…' /home/abuild/rpmbuild/SOURCES/libosmo-dsp.spec [ 156s] error: Bad source: /home/abuild/rpmbuild/SOURCES/HTML_TIMESTAMP.diff: No such file or directory [ 156s] ### VM INTERACTION START ### [ 156s] [ 141.268169][ T1] sysrq: Power Off [ 156s] [ 141.268787][ T6] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] obs-arm-8 failed "build libosmo-dsp.spec" at Tue Jul 19 00:59:42 UTC 2022. [ 157s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-dsp in openSUSE_Leap_15.2/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-dsp failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 86s] build-mkbaselibs-20200124.1-lp152.1.1 ######################################## [ 86s] fdupes-1.61-lp152.3.114 ######################################## [ 87s] net-tools-deprecated-2.0+git20170221.4######################################## [ 88s] kernel-obs-build-5.3.18-lp152.19.2 ######################################## [ 142s] now finalizing build dir... [ 142s] mktexlsr: Updating /etc/texmf/ls-R... [ 142s] mktexlsr: Updating /var/lib/texmf/main/ls-R... [ 143s] mktexlsr: Updating /var/cache/texmf/fonts/ls-R... [ 143s] mktexlsr: Updating /var/lib/texmf/ls-R... [ 143s] mktexlsr: Done. [ 145s] ----------------------------------------------------------------- [ 145s] I have the following modifications for libosmo-dsp.spec: [ 145s] 12c12 [ 145s] < Release: 0 [ 145s] --- [ 145s] > Release: lp152.1.1 [ 145s] ----------------------------------------------------------------- [ 145s] ----- building libosmo-dsp.spec (user abuild) [ 145s] ----------------------------------------------------------------- [ 145s] ----------------------------------------------------------------- [ 145s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define '_build_create_debug 1' --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Leap_15.2/29ba9c0…' /home/abuild/rpmbuild/SOURCES/libosmo-dsp.spec [ 145s] error: File /home/abuild/rpmbuild/SOURCES/HTML_TIMESTAMP.diff: No such file or directory [ 145s] ### VM INTERACTION START ### [ 145s] [ 128.885742] sysrq: Power Off [ 145s] [ 128.900025] reboot: Power down [ 146s] ### VM INTERACTION END ### [ 146s] [ 146s] lamb09 failed "build libosmo-dsp.spec" at Tue Jul 19 00:58:19 UTC 2022. [ 146s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-dsp in openSUSE_Leap_15.1/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-dsp failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 64s] build-mkbaselibs-20190128-lp151.1.1 ######################################## [ 64s] fdupes-1.61-lp151.2.70 ######################################## [ 64s] net-tools-deprecated-2.0+git20170221.4######################################## [ 65s] kernel-obs-build-4.12.14-lp151.27.3 ######################################## [ 106s] now finalizing build dir... [ 107s] mktexlsr: Updating /etc/texmf/ls-R... [ 107s] mktexlsr: Updating /var/lib/texmf/main/ls-R... [ 107s] mktexlsr: Updating /var/cache/texmf/fonts/ls-R... [ 107s] mktexlsr: Updating /var/lib/texmf/ls-R... [ 107s] mktexlsr: Done. [ 108s] ----------------------------------------------------------------- [ 108s] I have the following modifications for libosmo-dsp.spec: [ 108s] 12c12 [ 108s] < Release: 0 [ 108s] --- [ 108s] > Release: lp151.1.1 [ 108s] ----------------------------------------------------------------- [ 108s] ----- building libosmo-dsp.spec (user abuild) [ 108s] ----------------------------------------------------------------- [ 108s] ----------------------------------------------------------------- [ 108s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define '_build_create_debug 1' --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Leap_15.1/29ba9c0…' /home/abuild/rpmbuild/SOURCES/libosmo-dsp.spec [ 108s] error: File /home/abuild/rpmbuild/SOURCES/HTML_TIMESTAMP.diff: No such file or directory [ 108s] ### VM INTERACTION START ### [ 108s] [ 99.924893] sysrq: SysRq : Power Off [ 108s] [ 99.927285] reboot: Power down [ 108s] ### VM INTERACTION END ### [ 109s] [ 109s] lamb02 failed "build libosmo-dsp.spec" at Tue Jul 19 00:57:51 UTC 2022. [ 109s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-dsp in openSUSE_Tumbleweed/i586

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-dsp failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 99s] mktexlsr: Updating /usr/local/share/texmf... [ 99s] mktexlsr: Updating /usr/share/texmf... [ 99s] mktexlsr: Updating /var/cache/texmf/fonts... [ 99s] mktexlsr: Updating /var/cache/texmf/fonts/texmf... [ 99s] mktexlsr: Updating /var/lib/texmf... [ 99s] mktexlsr: Done. [ 99s] ... running 01-add_abuild_user_to_trusted_group [ 99s] ... running 02-set_timezone_to_utc [ 99s] ... running 03-set-permissions-secure [ 99s] ... running 11-hack_uname_version_to_kernel_version [ 100s] ----------------------------------------------------------------- [ 100s] I have the following modifications for libosmo-dsp.spec: [ 100s] 12c12 [ 100s] < Release: 0 [ 100s] --- [ 100s] > Release: 1.1 [ 100s] ----------------------------------------------------------------- [ 100s] ----- building libosmo-dsp.spec (user abuild) [ 100s] ----------------------------------------------------------------- [ 100s] ----------------------------------------------------------------- [ 101s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define '_build_create_debug 1' --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Tumbleweed/29ba9c…' /home/abuild/rpmbuild/SOURCES/libosmo-dsp.spec [ 101s] error: Bad source: /home/abuild/rpmbuild/SOURCES/HTML_TIMESTAMP.diff: No such file or directory [ 101s] ### VM INTERACTION START ### [ 101s] [ 95.070206][ T1] sysrq: Power Off [ 101s] [ 95.073249][ T18] reboot: Power down [ 101s] ### VM INTERACTION END ### [ 101s] [ 101s] lamb18 failed "build libosmo-dsp.spec" at Tue Jul 19 00:57:26 UTC 2022. [ 101s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-dsp in openSUSE_Tumbleweed/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-dsp failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 106s] mktexlsr: Updating /usr/local/share/texmf... [ 106s] mktexlsr: Updating /usr/share/texmf... [ 106s] mktexlsr: Updating /var/cache/texmf/fonts... [ 106s] mktexlsr: Updating /var/cache/texmf/fonts/texmf... [ 106s] mktexlsr: Updating /var/lib/texmf... [ 106s] mktexlsr: Done. [ 106s] ... running 01-add_abuild_user_to_trusted_group [ 106s] ... running 02-set_timezone_to_utc [ 106s] ... running 03-set-permissions-secure [ 106s] ... running 11-hack_uname_version_to_kernel_version [ 107s] ----------------------------------------------------------------- [ 107s] I have the following modifications for libosmo-dsp.spec: [ 107s] 12c12 [ 107s] < Release: 0 [ 107s] --- [ 107s] > Release: 1.1 [ 107s] ----------------------------------------------------------------- [ 107s] ----- building libosmo-dsp.spec (user abuild) [ 107s] ----------------------------------------------------------------- [ 107s] ----------------------------------------------------------------- [ 107s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define '_build_create_debug 1' --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Tumbleweed/29ba9c…' /home/abuild/rpmbuild/SOURCES/libosmo-dsp.spec [ 107s] error: Bad source: /home/abuild/rpmbuild/SOURCES/HTML_TIMESTAMP.diff: No such file or directory [ 107s] ### VM INTERACTION START ### [ 107s] [ 101.281465][ T1] sysrq: Power Off [ 107s] [ 101.284116][ T18] reboot: Power down [ 107s] ### VM INTERACTION END ### [ 107s] [ 107s] lamb62 failed "build libosmo-dsp.spec" at Tue Jul 19 00:57:36 UTC 2022. [ 107s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-dsp in openSUSE_Factory_ARM/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-dsp failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 79s] mktexlsr: Updating /var/cache/texmf/fonts/texmf... [ 79s] mktexlsr: Updating /var/lib/texmf... [ 79s] mktexlsr: Done. [ 79s] ... running 01-add_abuild_user_to_trusted_group [ 79s] ... running 02-set_timezone_to_utc [ 79s] ... running 03-set-permissions-secure [ 79s] ... running 11-hack_uname_version_to_kernel_version [ 80s] build target is armv7hl-suse-linux [ 80s] ----------------------------------------------------------------- [ 80s] I have the following modifications for libosmo-dsp.spec: [ 80s] 12c12 [ 80s] < Release: 0 [ 80s] --- [ 80s] > Release: 1.1 [ 80s] ----------------------------------------------------------------- [ 80s] ----- building libosmo-dsp.spec (user abuild) [ 80s] ----------------------------------------------------------------- [ 80s] ----------------------------------------------------------------- [ 81s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --target=armv7hl-suse-linux --define '_build_create_debug 1' --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Factory_ARM/29ba9…' /home/abuild/rpmbuild/SOURCES/libosmo-dsp.spec [ 81s] error: Bad source: /home/abuild/rpmbuild/SOURCES/HTML_TIMESTAMP.diff: No such file or directory [ 81s] Building target platforms: armv7hl-suse-linux [ 81s] Building for target armv7hl-suse-linux [ 81s] ### VM INTERACTION START ### [ 81s] [ 74.419391][ T1] sysrq: Power Off [ 81s] [ 74.420068][ T66] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] obs-arm-10 failed "build libosmo-dsp.spec" at Tue Jul 19 00:56:57 UTC 2022. [ 81s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: fsm: add unit tests verifying state timeout s/ms accuracy

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28648 ) Change subject: fsm: add unit tests verifying state timeout s/ms accuracy ...................................................................... fsm: add unit tests verifying state timeout s/ms accuracy This change adds test_state_chg_Ts() and test_state_chg_Tms() checking state timeout s/ms accuracy when using osmo_fsm_inst_state_chg() and osmo_fsm_inst_state_chg_ms() calls, respectively. test_state_chg_Tms() demonstrates that osmo_fsm_inst_state_chg_ms() is not working as expected: the timeout fires earlier than expected. Change-Id: I5a35730a8448292b075aefafed897353678250f9 Related: OS#5622 --- M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err 2 files changed, 100 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/28648/1 diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 2cfdacd..ec31dd2 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -386,6 +386,76 @@ fprintf(stderr, "--- %s() done\n", __func__); } +/* Test setting a state timeout with second granularity */ +static void test_state_chg_Ts(void) +{ + struct osmo_fsm_inst *fi; + + fprintf(stderr, "\n--- %s()\n", __func__); + + fsm.timer_cb = &timer_cb; + timeout_fired = -1; + fake_time_start(); + + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 8, 4242); + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(3, 0); /* +3s */ + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(2, 500000); /* +2.5s */ + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(2, 500000); /* +2.5s */ + OSMO_ASSERT(timeout_fired == 4242); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + fprintf(stderr, "--- %s() done\n", __func__); +} + +/* Test setting a state timeout with millisecond granularity */ +static void test_state_chg_Tms(void) +{ + struct osmo_fsm_inst *fi; + + fprintf(stderr, "\n--- %s()\n", __func__); + + fsm.timer_cb = &timer_cb; + timeout_fired = -1; + fake_time_start(); + + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg_ms(fi, ST_ONE, 1337, 4242); /* 1s 337ms */ + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(0, 500000); /* +500ms, 500ms total */ + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(0, 250000); /* +250ms, 750ms total */ + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(0, 350000); /* +350ms, 1s 100ms total */ + /* OSMO_ASSERT(timeout_fired == -1); */ + + /* FIXME: the timeout expires here, earlier than expected */ + + fake_time_passes(0, 200000); /* +200ms, 1s 300ms total */ + /* OSMO_ASSERT(timeout_fired == -1); */ + + fake_time_passes(0, 37000); /* +37ms, 1s 337ms total */ + /* OSMO_ASSERT(timeout_fired == 4242); */ + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + fprintf(stderr, "--- %s() done\n", __func__); +} + static const struct log_info_cat default_categories[] = { [DMAIN] = { .name = "DMAIN", @@ -434,6 +504,8 @@ test_id_api(); test_state_chg_keep_timer(); test_state_chg_T(); + test_state_chg_Ts(); + test_state_chg_Tms(); osmo_fsm_unregister(&fsm); exit(0); diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 4cc5ca4..f140d2e 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -116,3 +116,31 @@ Test_FSM{TWO}: Freeing instance Test_FSM{TWO}: Deallocated --- test_state_chg_T() done + +--- test_state_chg_Ts() +Total time passed: 0.000000 s +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: State change to ONE (T4242, 8s) +Total time passed: 3.000000 s +Total time passed: 5.500000 s +Total time passed: 8.000000 s +Test_FSM{ONE}: Timeout of T4242 +Test_FSM{ONE}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{ONE}: Freeing instance +Test_FSM{ONE}: Deallocated +--- test_state_chg_Ts() done + +--- test_state_chg_Tms() +Total time passed: 0.000000 s +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: State change to ONE (T4242, 1337ms) +Total time passed: 0.500000 s +Total time passed: 0.750000 s +Total time passed: 1.100000 s +Test_FSM{ONE}: Timeout of T4242 +Total time passed: 1.300000 s +Total time passed: 1.337000 s +Test_FSM{ONE}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{ONE}: Freeing instance +Test_FSM{ONE}: Deallocated +--- test_state_chg_Tms() done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5a35730a8448292b075aefafed897353678250f9 Gerrit-Change-Number: 28648 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: fsm: fix state_chg(): pass microseconds to osmo_timer_schedule()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28649 ) Change subject: fsm: fix state_chg(): pass microseconds to osmo_timer_schedule() ...................................................................... fsm: fix state_chg(): pass microseconds to osmo_timer_schedule() As was demonstrated in [1], osmo_fsm_inst_state_chg_ms() is broken. The problem is in state_chg(): this function is passing *milli*seconds to osmo_timer_schedule(), while it expects *micro*seconds. Change-Id: Ib0b6c3bdb56e4279df9e5ba7db16841645c452aa Related: [1] I5a35730a8448292b075aefafed897353678250f9 Fixes: I35b330e460e80bb67376c77e997e464439ac5397 Fixes: OS#5622 --- M src/fsm.c M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err 3 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/28649/1 diff --git a/src/fsm.c b/src/fsm.c index 8b0b27b..c84617c 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -685,8 +685,11 @@ if (!keep_timer || (keep_timer && !osmo_timer_pending(&fi->timer))) { fi->T = T; - if (timeout_ms) - osmo_timer_schedule(&fi->timer, timeout_ms / 1000, timeout_ms % 1000); + if (timeout_ms) { + osmo_timer_schedule(&fi->timer, + /* seconds */ timeout_ms / 1000, + /* microseconds */ timeout_ms % 1000 * 1000); + } } /* Call 'onenter' last, user might terminate FSM from there */ diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index ec31dd2..6fa0ae7 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -441,15 +441,13 @@ OSMO_ASSERT(timeout_fired == -1); fake_time_passes(0, 350000); /* +350ms, 1s 100ms total */ - /* OSMO_ASSERT(timeout_fired == -1); */ - - /* FIXME: the timeout expires here, earlier than expected */ + OSMO_ASSERT(timeout_fired == -1); fake_time_passes(0, 200000); /* +200ms, 1s 300ms total */ - /* OSMO_ASSERT(timeout_fired == -1); */ + OSMO_ASSERT(timeout_fired == -1); fake_time_passes(0, 37000); /* +37ms, 1s 337ms total */ - /* OSMO_ASSERT(timeout_fired == 4242); */ + OSMO_ASSERT(timeout_fired == 4242); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index f140d2e..51bf5da 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -137,9 +137,9 @@ Total time passed: 0.500000 s Total time passed: 0.750000 s Total time passed: 1.100000 s -Test_FSM{ONE}: Timeout of T4242 Total time passed: 1.300000 s Total time passed: 1.337000 s +Test_FSM{ONE}: Timeout of T4242 Test_FSM{ONE}: Terminating (cause = OSMO_FSM_TERM_REQUEST) Test_FSM{ONE}: Freeing instance Test_FSM{ONE}: Deallocated -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0b6c3bdb56e4279df9e5ba7db16841645c452aa Gerrit-Change-Number: 28649 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: ts_31_103: Fix typos related to IMSConfigData + MudMidConfigData

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28630 ) Change subject: ts_31_103: Fix typos related to IMSConfigData + MudMidConfigData ...................................................................... ts_31_103: Fix typos related to IMSConfigData + MudMidConfigData s/neted/nested/ Change-Id: I9049ed12b8e7e6d1fdb7d19ed0b98ce8b46f9b0e --- M pySim/ts_31_103.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index a4f7983..83ac6c1 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -181,7 +181,7 @@ class ImsConfigData(BER_TLV_IE, tag=0x81): _construct = GreedyString # pylint: disable=undefined-variable - class ImsConfigDataCollection(TLV_IE_Collection, neted=[ImsConfigDataEncoding, ImsConfigData]): + class ImsConfigDataCollection(TLV_IE_Collection, nested=[ImsConfigDataEncoding, ImsConfigData]): pass def __init__(self, fid='6ff8', sfid=None, name='EF.IMSConfigData', desc='IMS Configuration Data', **kwargs): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, **kwargs) @@ -248,7 +248,7 @@ class MudMidConfigData(BER_TLV_IE, tag=0x81): _construct = GreedyString # pylint: disable=undefined-variable - class MudMidConfigDataCollection(TLV_IE_Collection, neted=[MudMidConfigDataEncoding, MudMidConfigData]): + class MudMidConfigDataCollection(TLV_IE_Collection, nested=[MudMidConfigDataEncoding, MudMidConfigData]): pass def __init__(self, fid='6ffe', sfid=None, name='EF.MuDMiDConfigData', desc='MuD and MiD Configuration Data', **kwargs): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9049ed12b8e7e6d1fdb7d19ed0b98ce8b46f9b0e Gerrit-Change-Number: 28630 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022