Selaa lähdekoodia

Seems to work

Yentl Van Tendeloo 9 vuotta sitten
vanhempi
commit
81eaf9d7ea

+ 6 - 7
hybrid_server/classes/mvkcontroller.xml

@@ -11,6 +11,7 @@
             self.mvk = ModelverseKernel(self.root)
             self.all_failed = False
             self.timeout = False
+            self.init_time = time.time()
 
             self.users = set()
             self.input_queue = defaultdict(list)
@@ -90,8 +91,6 @@
                         <parameter name="data"/>
                         <script>
                             # No JSON encoding necessary, as it is not complex
-                            print("Take transition!")
-                            print("Data: " + str(data))
                             if data["op"] == "set_input":
                                 if "element_type" in data:
                                     if data["element_type"] == "V":
@@ -108,7 +107,6 @@
                                         d.append([t, v])
                                     self.input_queue[data["username"]].append((source, d))
                             elif data["op"] == "get_output":
-                                print("Registered output listener")
                                 self.output_queue[data["username"]].append(source)
                             else:
                                 raise Exception("DROPPING unknown operation: " + str(data["op"]))
@@ -155,7 +153,6 @@
                                             self.destination = self.output_queue[user].pop(0)
                                             self.value = self.mvk.returnvalue
                                             self.all_failed = False
-                                            print("Send output!")
                             else:
                                 out = self.mvs.read_outgoing(self.root)[0]
                                 for m in out:
@@ -168,19 +165,21 @@
                                         continue
                                     self.users.add(name)
                                 self.timeout = self.all_failed
+                                if self.timeout:
+                                    print("TIMEOUT")
                                 self.all_failed = True
                         </script>
                     </onentry>
 
-                    <transition cond="self.destination is not None" after="0" target=".">
+                    <transition cond="self.destination is not None" after="self.sccd_yield()" target=".">
                         <raise event="HTTP_input" scope="narrow" target="'to_mvi/%s' % self.destination">
                             <parameter expr="self.value"/>
                         </raise>
                     </transition>
 
-                    <transition cond="self.timeout and self.destination is None" after="0.1" target="."/>
+                    <transition cond="self.timeout and self.destination is None" after="self.sccd_yield() + 0.1" target="."/>
 
-                    <transition cond="not self.timeout and self.destination is None" after="0" target="."/>
+                    <transition cond="not self.timeout and self.destination is None" after="self.sccd_yield()" target="."/>
                 </state>
             </state>
 

+ 0 - 3
hybrid_server/classes/server.xml

@@ -22,9 +22,6 @@
                     <transition event="HTTP_output" target=".">
                         <parameter name="association_name"/>
                         <parameter name="data"/>
-                        <script>
-                            print("Pass from MVI")
-                        </script>
                         <raise event="from_mvi" scope="narrow" target="'parent'">
                             <parameter expr="association_name"/>
                             <parameter expr="data"/>

+ 1 - 27
hybrid_server/classes/socket.xml

@@ -21,7 +21,6 @@
                 <parameter name="association_name"/>
                 <script>
                     self.association_name = association_name
-                    print("Open new")
                 </script>
             </transition>
         </state>
@@ -38,7 +37,6 @@
                         <parameter name="data"/>
                         <script>
                             self.received_data += data
-                            print("Received " + str(self.received_data))
                         </script>
                         <raise event="received_data"/>
                     </transition>
@@ -46,23 +44,12 @@
                         <parameter name="socket"/>
                         <parameter name="data"/>
                         <raise event="received_data"/>
-                        <script>
-                            print("Socket sends 0")
-                        </script>
-                    </transition>
-                    <transition event="received_socket" port="socket_in" cond="self.socket != socket" target=".">
-                        <parameter name="socket"/>
-                        <parameter name="data"/>
-                        <script>
-                            print("Wrong socket received!")
-                        </script>
                     </transition>
                 </state>
                 <state id="closed">
                     <onentry>
                         <script>
                             self.closed = True
-                            print("CLOSE")
                         </script>
                     </onentry>
                 </state>
@@ -107,11 +94,6 @@
 
             <state id="parsing" initial="wait_for_header">
                 <state id="wait_for_header">
-                    <onentry>
-                        <script>
-                            print("Waiting for header!")
-                        </script>
-                    </onentry>
                     <transition cond="'\r\n\r\n' in self.received_data and self.received_data.startswith('POST')" target="../wait_for_payload">
                         <script>
                             header, self.received_data = self.received_data.split("\r\n\r\n", 1)
@@ -126,18 +108,10 @@
                         </script>
                     </transition>
                     <transition cond="self.closed and len(self.received_data) == 0" target="../closing">
-                        <script>
-                            print("Closing up :(")
-                        </script>
                     </transition>
                 </state>
                 <state id="closing">
-                    <onentry>
-                        <script>
-                            print("CLOSE")
-                        </script>
-                    </onentry>
-                    <transition after="1" target=".">
+                    <transition after="0.1" target=".">
                         <raise event="close"/>
                     </transition>
                 </state>

+ 1 - 0
hybrid_server/server.xml

@@ -4,6 +4,7 @@
         Modelverse Kernel server. Server for the MvI, client of the MvS.
     </description>
     <top>
+        import sccd.runtime.accurate_time as accurate_time
         import time
         import os
         import urllib

+ 0 - 1
hybrid_server/socket2event.py

@@ -28,7 +28,6 @@ def receive_from_socket(controller, sock, recv_event):
         if not run_sockets[sock]:
             break
         data = sock.recv(2**16)
-        print("Forwarding data: " + str(data))
         controller.addInput(Event("received_socket", "socket_in", [sock, data]))
 
 def send_to_socket(controller, sock, data_queue, send_event):