Refactoring

1 files changed, 16 insertions, 16 deletions

diff --git a/esds/node.py b/esds/node.py
index 1195ad1..e26e239 100644
--- a/esds/node.py
+++ b/esds/node.py
@@ -50,7 +50,7 @@ class Node:
     def abort(self,reason):
         self.rargs=reason
         self["request"]="abort"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         while True: continue
 
     def log(self,msg):
@@ -58,13 +58,13 @@ class Node:
             self.abort("log() called with a non-string argument")
         self.rargs=msg
         self["request"]="log"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["log"])
 
     def read(self, register):
         self["request"]="read"
         self.rargs=register
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         ack=self.wait_ack(["read"])
         return ack[1]
 
@@ -73,27 +73,27 @@ class Node:
             self.abort("wait() called with a non-number duration")
         self.rargs=duration
         self["request"]="timeout_add"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["timeout_add"])
         self["state"]="pending"
         self.wait_ack(["timeout"])
 
     def wait_end(self):
         self["request"]="wait_end"
-        self["state"]="request"
+        self["state"]="call_blocking"
         self.wait_ack(["wait_end"])
         self.wait_ack(["sim_end"])
 
     def turn_off(self):
         self["turned_on"]=False
         self["request"]="turn_off"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["turn_off"])
         
     def turn_on(self):
         self["turned_on"]=True
         self["request"]="turn_on"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["turn_on"])
         
     def send(self, interface, data, datasize, dst):
@@ -106,7 +106,7 @@ class Node:
         self.plugin_notify("send_call",(interface,data,datasize,dst))
         self.rargs=(interface, data, datasize, dst)
         self["request"]="send"
-        self["state"]="request"
+        self["state"]="call_blocking"
         ack=self.wait_ack(["send","send_cancel"])
         self.plugin_notify("send_return",(interface,data,datasize,dst,ack[1]))
         return ack[1]
@@ -122,19 +122,19 @@ class Node:
             self.abort("send() called with a non-number dst (wired interfaces) or dst is not None (wireless interfaces)")
         self.rargs=timeout
         self["request"]="timeout_add"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["timeout_add"])
         self.rargs=(interface, data, datasize, dst)
         self["request"]="send"
-        self["state"]="request"
+        self["state"]="call_blocking"
         ack=self.wait_ack(["send","timeout","send_cancel"])
         if ack[0] == "timeout":
             self["request"]="send_cancel"
-            self["state"]="call"
+            self["state"]="call_non_blocking"
             self.wait_ack(["send_cancel"])
             return -1
         self["request"]="timeout_remove"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["timeout_remove"])
         return ack[1]
         
@@ -143,7 +143,7 @@ class Node:
             self.abort("receive() called with an unknown interface \""+interface+"\"")
         self["request"]="receive"
         self.rargs=interface
-        self["state"]="request"
+        self["state"]="call_blocking"
         self.wait_ack(["receive"])
         data,start_at,end_at=self["interfaces"][interface].get()
         self.plugin_notify("receive_return",(interface,data,start_at,end_at))
@@ -156,16 +156,16 @@ class Node:
             self.abort("receivet() called with a non-number timeout")
         self.rargs=timeout
         self["request"]="timeout_add"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["timeout_add"])
         self["request"]="receive"
         self.rargs=interface
-        self["state"]="request"
+        self["state"]="call_blocking"
         ack=self.wait_ack(["receive","timeout"])
         if ack[0] == "timeout":
             return (-1,None)
         self["request"]="timeout_remove"
-        self["state"]="call"
+        self["state"]="call_non_blocking"
         self.wait_ack(["timeout_remove"])
         data,start_at,end_at=self["interfaces"][interface].get()
         self.plugin_notify("receivet_return",(interface,data,start_at,end_at))