diff options
| author | Loic Guegan <manzerbredes@mailbox.org> | 2022-09-09 18:47:02 +0200 |
|---|---|---|
| committer | Loic Guegan <manzerbredes@mailbox.org> | 2022-09-09 18:47:02 +0200 |
| commit | 0e1e51d1ee7392d22336e9bf0067a895741e8866 (patch) | |
| tree | 02ea76f9ff9783a0ebdad8acaa4c8fd1af7376da | |
| parent | bc4ce548db258f79f0841def89f1a70316cef43d (diff) | |
Improve debug
| -rw-r--r-- | esds/debug.py | 6 | ||||
| -rw-r--r-- | esds/simulator.py | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/esds/debug.py b/esds/debug.py index fe19745..66a781a 100644 --- a/esds/debug.py +++ b/esds/debug.py @@ -13,11 +13,13 @@ class Debug: self.loop_count=0 self.logs=list() header={ + "debug_version": 1, "python_version" : sys.version, "simulation_started_at": simulator.startat, "number_of_nodes": len(simulator.nodes), "manual_breakpoints": breakpoints, - "auto_breakpoint": breakpoints_every + "auto_breakpoint": breakpoints_every, + "interferences": interferences } self.write(header,append=False) @@ -27,7 +29,7 @@ class Debug: def write(self,data, append=True): mode="a" if append else "w" with open(self.file_path, mode) as f: - f.write(json.dumps(data,default=serialize_int64)) + f.write(json.dumps(data,default=serialize_int64,separators=(",",":"))) f.write("\n") def get_network_interfaces(self): diff --git a/esds/simulator.py b/esds/simulator.py index fb52fec..adb2011 100644 --- a/esds/simulator.py +++ b/esds/simulator.py @@ -375,9 +375,6 @@ class Simulator: # Synchronize blocking api calls for node in self.nodes: self.sync_node_blocking(node) - # Generate debug logs - if debug: - self.debug.debug() # Simulation end if len(self.events) <= 0 or len(self.events) == 1 and self.events[0,0] == 3: # Notify nodes that wait for the end of the simulation @@ -390,7 +387,9 @@ class Simulator: else: node.rqueue.put(("sim_end",RCode.SUCCESS)) break # End the event processing loop - + # Generate debug logs + if debug: + self.debug.debug() # Update simulation time self.time=self.events[0,1] self.time_truncated=format(self.time,self.precision) # refresh truncated time @@ -458,3 +457,7 @@ class Simulator: ##### Simulation ends self.log("Simulation ends") + + ##### Final debug call + if debug: + self.debug.debug() |