From 7399643939ae4291230a099f904767a7d4bd95e2 Mon Sep 17 00:00:00 2001
From: Thanassis Tsiodras <Thanassis.Tsiodras@esa.int>
Date: Wed, 12 Sep 2018 17:46:34 +0200
Subject: [PATCH] Update the skeleton for the MSC-generated Python scripts.

---
 MSCtoPython.stg | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/MSCtoPython.stg b/MSCtoPython.stg
index cf230ea..f504d57 100644
--- a/MSCtoPython.stg
+++ b/MSCtoPython.stg
@@ -101,7 +101,7 @@ def runScenario(pipe_in=None, pipe_out=None, udpController=None):
     # Queue for getting scenario status
     log = Queue.Queue()
     if udpController:
-        <inst.CleanName> = Exercise_<inst.CleanName>(log, name='Scenario')
+        <inst.CleanName> = Exercise_<inst.CleanName>(log, name='Exercise_<inst.CleanName>')
         udpController.slots.append(<inst.CleanName>.msq_q)
         <inst.CleanName>.wait()
         udpController.slots.remove(<inst.CleanName>.msg_q)
@@ -109,12 +109,13 @@ def runScenario(pipe_in=None, pipe_out=None, udpController=None):
     else:
     # Use old-style message queue
         poller = PollerThread()
-        <inst.CleanName> = Exercise_<inst.CleanName>(log, name='Scenario')
+        <inst.CleanName> = Exercise_<inst.CleanName>(log, name='Exercise_<inst.CleanName>')
         poller.slots.append(<inst.CleanName>.msg_q)
         poller.start()
         <inst.CleanName>.start()
         # Wait and log messages from both scenarii
         while True:
+            time.sleep(0.001)
             try:
                 scenario, severity, msg = log.get(block=False)
             except Queue.Empty:
@@ -165,7 +166,7 @@ poller.slots.append(<inst.CleanName>.msg_q)}>}>}>
 
 PrintMscInstance(inst) ::= <<
 @Scenario
-def Exercise_<inst.CleanName>(queue):
+def Exercise_<inst.CleanName>(queue):  # queue is actually an instance of the Scenario class
     '''<inst.CleanName> processing'''
     <inst.events:{evt|<PrintEvent(evt)>}; separator="\n">
     return 0
-- 
GitLab