Updated the run_local_modelverse script to include the actual call file, making profiling possible

hybrid_server/classes/mvkcontroller.xml

@@ -70,7 +70,7 @@
                 else:
                     print("warning: unknown kernel option '%s'." % opt)
 
-            self.port = int(sys.argv[1])
+            self.port = int(params[0])
 
             self.sc_map = {}
             self.forward = None

scripts/run_local_modelverse.py

@@ -27,20 +27,23 @@ try:
         service = subprocess.Popen([sys.executable, service_path, "127.0.0.1:%s" % port])
         services.append(service)
 
+    #os.chdir("hybrid_server")
+    #program_to_execute = [sys.executable, "run_mvk_server.py", port]
+    #server = subprocess.Popen(program_to_execute)
+    #server.wait()
+
+    sys.path.append("hybrid_server")
+    sys.path.append(".")
     os.chdir("hybrid_server")
-    program_to_execute = [sys.executable, "run_mvk_server.py", port]
-    #program_to_execute = [sys.executable, "run_mvk_server.py", port, "--kernel=generated"]
-    server = subprocess.Popen(program_to_execute)
 
-    server.wait()
+    import server
+    import sccd.runtime.socket2event as socket2event
 
-finally:
-    # Stop the server
-    try:
-        server.terminate()
-    except:
-        pass
+    controller = server.Controller([port])
+    socket2event.boot_translation_service(controller)
+    controller.start()
 
+finally:
     # Terminate all services as well
     for service in services:
         try:

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Mon Apr 23 15:44:35 2018
+Date:   Tue Apr 24 07:09:57 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server