Fix a lot of bugs--core callbacks being delayed, reused handles

1 files changed, 3 insertions, 10 deletions

diff --git a/nemesis/nemesis.py b/nemesis/nemesis.py
index 2e3837a..e593625 100755
--- a/nemesis/nemesis.py
+++ b/nemesis/nemesis.py
@@ -70,7 +70,7 @@ class Nemesis(object):
     experiment_time = None
 
     # results from previous experiments. Keys represent names of coroutines.
-    results = defaultdict(lambda: defaultdict(lambda: []))
+    results = defaultdict(lambda: defaultdict(lambda: defaultdict(lambda: [])))
 
     # the file to write results to
     filename = None
@@ -141,18 +141,11 @@ class Nemesis(object):
             latency = []
             virtual_run_time = []
             for loop in loops:
-                latency.extend(loop.get_completed_coros())
-
                 pause_time = loop.get_pause_time()
-                virtual_run_time.append(Nemesis.experiment_time - pause_time)
-
-            results = {
-                "latency": latency,
-                "virtual_run_time": virtual_run_time,
-            }
+                results = Nemesis.results[Nemesis.experiment_coro][Nemesis.experiment_spdp][loop._thread_id]
+                results.append((loop.get_completed_coros(), loop.get_pause_time()))
 
             print(f'Ran {Nemesis.experiment_coro} at {Nemesis.experiment_spdp} speed')
-            Nemesis.results[Nemesis.experiment_coro][Nemesis.experiment_spdp].append(results)
             del Nemesis.experiment_data
 
     @staticmethod