Sfoglia il codice sorgente

Do some notification when input is received, so we can yield longer

Yentl Van Tendeloo 8 anni fa
parent
commit
162ad7c3b0

+ 0 - 5
hybrid_server/classes/mvkcontroller.xml

@@ -228,7 +228,6 @@
                             <parameter expr="json.dumps(self.HTTP_reply)"/>
                         </raise>
                         <script>
-                            print("SEND INPUT")
                             self.HTTP_reply = None
                             self.forward = None
                         </script>
@@ -239,7 +238,6 @@
                             <parameter expr="json.dumps(self.HTTP_reply)"/>
                         </raise>
                         <script>
-                            print("QUEUE INPUT")
                             self.input_queue[self.forward[0]].append(self.forward[2])
                             self.HTTP_reply = None
                             self.forward = None
@@ -282,7 +280,6 @@
                                     if name.startswith("__"):
                                         continue
                                     tasks.add(name)
-                                    print("Saw " + str(name))
 
                                 self.new_tasks = set([i for i in tasks if i not in self.sc_map])
                                 self.old_tasks = set([i for i in self.sc_map if i not in tasks])
@@ -299,7 +296,6 @@
                             <onentry>
                                 <script>
                                     self.task = self.new_tasks.pop()
-                                    print("SPAWN TASK: " + str(self.task))
                                 </script>
                                 <raise event="create_instance" scope="cd">
                                     <parameter expr="'tasks'"/>
@@ -356,7 +352,6 @@
                     <state id="mvs_GC">
                         <onentry>
                             <script>
-                                print("GC")
                                 self.mvs.garbage_collect()
                             </script>
                             <raise scope="broad" event="resume_task"/>

+ 3 - 5
hybrid_server/classes/task.xml

@@ -82,13 +82,12 @@
                         </onentry>
 
                         <transition cond="self.failed" target="../../failed"/>
-                        <transition cond="self.mvk.success" target="."/>
+                        <transition after="self.sccd_yield()" target="."/>
                         <transition cond="not self.mvk.success" target="../yielded"/>
                     </state>
 
                     <state id="yielded">
-                        <!-- TODO increase timeout duration -->
-                        <transition after="self.sccd_yield() + 0.2" target="../executing"/>
+                        <transition after="self.sccd_yield() + 0.5" target="../executing"/>
                         <transition event="processed_input" target="../executing"/>
                     </state>
                 </state>
@@ -111,13 +110,13 @@
                     <transition event="input" target=".">
                         <parameter name="params"/>
                         <script>
-                            print("GOT INPUT: " + str(params))
                             for args_entry in params:
                                 if not self.execute_modelverse(self.taskname, "set_input", [args_entry]):
                                     # Failed!
                                     self.failed = True
                                     break
                         </script>
+                        <raise event="processed_input"/>
                     </transition>
 
                     <transition event="output" target=".">
@@ -130,7 +129,6 @@
                     <transition cond="self.outputs" target=".">
                         <script>
                             source, value = self.outputs.pop(0)
-                            print("Source: " + str(source))
                         </script>
                         <raise event="HTTP_input" scope="narrow" target="'parent/to_mvi/%s' % source">
                             <parameter expr="json.dumps(value)"/>