fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/44066?usp=email ) Change subject: library: fix [T.running] T.timeout alt guards ...................................................................... library: fix [T.running] T.timeout alt guards Since titan.core commit 4ca840ba5 ("Fixed alts and altsteps to re- evaluate guard expressions and variable initial values after every new snapshot", #747), first released in 11.2.0, boolean guards are re-evaluated on every snapshot. TIMER::running() uses the current time, while TIMER::timeout() uses the snapshot time, so as soon as the timer expires the guard [T.running] becomes false and the T.timeout branch can never be selected. The guard is redundant anyway: the timeout operation on a timer that is not running simply does not match. Remove it. Change-Id: I263fe10359dc81e1fcf68690930bad7941ad3174 --- M bts/BTS_Tests.ttcn M library/BSSGP_Emulation.ttcnpp M library/NS_Emulation.ttcnpp 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/44066/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c9aff76..cd77e3a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2431,7 +2431,7 @@ [] RSL.receive(tr_RSL_MEAS_RES(?)) -> value rsl { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected MEAS RES ", rsl)); } - [g_Tmeas_exp.running] g_Tmeas_exp.timeout { + [] g_Tmeas_exp.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Didn't receive expected measurement result") } } diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index d01c7a2..371eecf 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -459,7 +459,7 @@ } } } - [g_T2.running] g_T2.timeout { + [] g_T2.timeout { setverdict(fail, "Timeout waiting for BVC-RESET-ACK on BVCI=0"); BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0)); g_T2.start; @@ -1115,10 +1115,10 @@ f_ptp_change_state(BVC_S_BLOCKED); } /* Re-transmit BLOCK / UNBLOCK on T1 timeout */ - [g_T1.running and not g_t1_waits_for_block_ack] g_T1.timeout { + [not g_t1_waits_for_block_ack] g_T1.timeout { f_ptp_sendUnblock(); } - [g_T1.running and g_t1_waits_for_block_ack] g_T1.timeout { + [g_t1_waits_for_block_ack] g_T1.timeout { f_ptp_sendBlock(g_last_block_cause); } diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 0ed022a..d1700f8 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.running] Tns_alive.timeout { + [] 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.running] Tns_test.timeout { + [] Tns_test.timeout { log("Tns-test expired: sending NS-ALIVE"); f_sendAlive(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/44066?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I263fe10359dc81e1fcf68690930bad7941ad3174 Gerrit-Change-Number: 44066 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>