aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-03-02 21:40:03 +0100
committerHarald Welte <laforge@gnumonks.org>2018-03-03 22:40:01 +0100
commitc27f684998402d88c4f3837a1fd49c0287c41b0a (patch)
tree7ec499dffa8dc7182d29398d87365cedb2418637
parentacc93ab873d79399c17e2b7e83d1b42a1a910061 (diff)
Gb: avoid warnings about not-running timers
If we have T.timeout clause in an alt/altstep, we should put [T.running] as guard expression to avoid warnings about matching on timers never started - at least for timers where this is a valid situation. Change-Id: I96db5c288e0b9c47539cccab8ae7a886d0b9fff3
-rw-r--r--library/BSSGP_Emulation.ttcn4
-rw-r--r--library/NS_Emulation.ttcn4
2 files changed, 4 insertions, 4 deletions
diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn
index c4628be2..06e47338 100644
--- a/library/BSSGP_Emulation.ttcn
+++ b/library/BSSGP_Emulation.ttcn
@@ -453,7 +453,7 @@ altstep as_allstate() runs on BSSGP_CT {
}
altstep as_blocked() runs on BSSGP_CT {
- [] g_T1.timeout {
+ [g_T1.running] g_T1.timeout {
f_sendUnblock();
}
[] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK_ACK(g_cfg.bvci), 0)) {
@@ -483,7 +483,7 @@ altstep as_unblocked() runs on BSSGP_CT {
g_T1.stop;
f_change_state(BVC_S_BLOCKED);
}
- [] g_T1.timeout {
+ [g_T1.running] g_T1.timeout {
f_sendBlock(BSSGP_CAUSE_OM_INTERVENTION);
}
[] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK_ACK(g_cfg.bvci), 0)) -> value udi {
diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn
index 5924bbe3..27acae27 100644
--- a/library/NS_Emulation.ttcn
+++ b/library/NS_Emulation.ttcn
@@ -142,13 +142,13 @@ module NS_Emulation {
var ASP_Event evt;
/* 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(NSE_S_DEAD_BLOCKED);
Tns_test.start;
}
- [] Tns_test.timeout {
+ [Tns_test.running] Tns_test.timeout {
log("Tns-test expired: sending NS-ALIVE");
f_sendAlive();
}