소스 검색

Fixed socket2event race condition

Yentl Van Tendeloo 9 년 전
부모
커밋
b4ac52bd61

+ 3 - 3
hybrid_server/socket2event.py

@@ -86,10 +86,10 @@ def _start_on_daemon_thread(func, args):
     thrd.start()
 
 def boot_translation_service(controller):
-    _start_on_daemon_thread(_poll, [controller, None])
-
-def _poll(controller, _):
     socket_out = controller.addOutputListener("socket_out")
+    _start_on_daemon_thread(_poll, [controller, socket_out])
+
+def _poll(controller, socket_out):
     while 1:
         evt = socket_out.fetch(-1)
         name, params = evt.getName(), evt.getParameters()

+ 4 - 0
interface/HUTN/hutn_compiler/primitives_visitor.py

@@ -111,12 +111,14 @@ class PrimitivesVisitor(Visitor):
         a = self.value("assign")
         var = self.get_primitive(tree.get_tail()[0])
         value = self.get_primitive(tree.get_tail()[-1])
+        print("Value: " + str(value))
         self.dict(a, "var", var)
         self.dict(a, "value", value)
 
         self.set_primitive(tree, a)
 
     def visit_expression(self, tree):
+        print([i.head for i in tree.get_tail()])
         self.forward_primitive_of_child(tree, 0)
 
     def visit_binary_operation(self, tree):
@@ -199,6 +201,7 @@ class PrimitivesVisitor(Visitor):
         self.set_primitive(tree, r)
 
     def visit_func_call(self, tree):
+        print([i.head for i in tree.get_tail()])
         self.visit_children(tree)
 
         symbol = self.get_symbol(tree.get_tail()[0])
@@ -232,6 +235,7 @@ class PrimitivesVisitor(Visitor):
             self.dict(c, "last_param", arg_nodes_reversed[0])
 
         self.set_primitive(tree, c)
+        print("Added " + str(c))
 
     def visit_input(self, tree):
         self.visit_children(tree)

+ 2 - 1
interface/HUTN/test/constructor_compilation_action_language/code/dict_access.al

@@ -1,4 +1,5 @@
-include "primitives.alh"
+Element function dict_read(a : Element, b : Element)
+Integer function integer_addition(a : Integer, b : Integer)
 
 Void function my_func():
 	Element d