[MERGED] osmo-ttcn3-hacks[master]: Gb: avoid warnings about not-running timers

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Gb: avoid warnings about not-running timers
......................................................................


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
---
M library/BSSGP_Emulation.ttcn
M library/NS_Emulation.ttcn
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn
index c4628be..06e4733 100644
--- a/library/BSSGP_Emulation.ttcn
+++ b/library/BSSGP_Emulation.ttcn
@@ -453,7 +453,7 @@
 }
 
 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 @@
                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 5924bbe..27acae2 100644
--- a/library/NS_Emulation.ttcn
+++ b/library/NS_Emulation.ttcn
@@ -142,13 +142,13 @@
                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();
                }

-- 
To view, visit https://gerrit.osmocom.org/7071
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I96db5c288e0b9c47539cccab8ae7a886d0b9fff3
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder