diff options
Diffstat (limited to 'esds.py')
| -rw-r--r-- | esds.py | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -252,8 +252,12 @@ class Simulator: for node in self.nodes: s=node["state"] states[s]=states[s]+1 if s in states else 1 - if self.sharing["eth0"][node.node_id] > 0: - sharing["n"+str(node.node_id)]=str(int(self.sharing["eth0"][node.node_id])) + node_key="n"+str(node.node_id) + for interface in self.sharing.keys(): + if self.sharing[interface][node.node_id] > 0: + if node_key not in sharing: + sharing[node_key] = "" + sharing[node_key]+=str(int(self.sharing[interface][node.node_id])) print("Node number per state: ",end="") for key in states: print(key+"="+str(states[key]), end=" ") @@ -315,18 +319,12 @@ class Simulator: node["state"]="running" if node.rargs == "clock": node.rqueue.put(("read",self.time)) - elif node.rargs == "wlan0_ncom": + elif node.rargs[0:5] == "ncom_": # ncom_<interface> register + interface=node.rargs[5:] count=0 # Count number of communication on wlan0 for event in self.events: - if event[0] == 0 and event[2][1] == node.node_id and event[2][2] == "wlan0": - count+=1 - node.rqueue.put(("read",count)) - elif node.rargs == "eth0_ncom": - count=0 - # Count number of communication on eth0 - for event in self.events: - if event[0] == 0 and event[2][1] == node.node_id and event[2][2] == "eth0": + if event[0] == 0 and event[2][1] == node.node_id and event[2][2] == interface: count+=1 node.rqueue.put(("read",count)) else: |