Improve reporting format, separate samples based on tident

1 files changed, 23 insertions, 9 deletions

diff --git a/nemesis/experiment.py b/nemesis/experiment.py
index 9d179ea..353d013 100644
--- a/nemesis/experiment.py
+++ b/nemesis/experiment.py
@@ -16,9 +16,13 @@ class Experiment:
     # event loops participating in this this experiment
     loops = []
     # a key-value pair where keys represent a handle and values
-    # represent number of times sampled.
+    # represent the period of time waiting
     _samples = None
 
+    # the amount of time required for a handle to be included in
+    # a report
+    _wait_time_threshold = 0.001
+
     def __init__(self, coro, speedup):
         self._coro = coro
         self._speedup = speedup
@@ -35,11 +39,21 @@ class Experiment:
     def get_results(self):
         ret = f"Results for {self._coro} at {self._speedup} times speedup:\n"
         if len(self._samples) > 0:
-            ret += (f"	{'HANDLE':<30} {'LOOP':<10} {'SEC':<10}")
+            ret += (f"  {'NAME':<15} {'FUNC/CORO':<45} {'TIDENT':<16} {'SEC':<10}")
+            ret += (f"\n  {'---':<15} {'---':<45} {'---':<16} {'---':<10}")
+            tot = 0
             for key in self._sort_samples(self._samples):
-                ret += f"\n	{self._get_sample_str(key)}"
+                name = self._trim_to_last_x_chars(key[0], 15)
+                ctxt = self._trim_to_last_x_chars(key[1], 45)
+                tid = key[2]
+                value = round(self._samples[key] / self._speedup, 4)
+                tot += value
+                if value >= self._wait_time_threshold:
+                    ret += f"\n  {name:<15} {ctxt:<45} {tid:<16} {value:<10}"
+            ret += f"\n  {'':<79}---"
+            ret += f"\n  {'':<79}{round(tot, 4)}"
         else:
-            ret += "	No samples were gathered. (This is odd!)"
+            ret += "  No samples were gathered. (This is odd!)"
         return ret
 
     def get_loops(self):
@@ -47,7 +61,8 @@ class Experiment:
 
     def add_handles(self, handles, loop, time):
         for h in handles:
-            self._samples[h.__str__()] += time
+            h.append(loop._thread_id)
+            self._samples[tuple(h)] += time
 
     def _set_loops(self):
         self._loops = self._get_event_loops()
@@ -81,12 +96,11 @@ class Experiment:
                 frame = frame.f_back
         return None
 
-    def _get_sample_str(self, key):
-        value = self._samples[key] / self._speedup
-        return f"{key:29} {value:10}"
-
     def _sort_samples(self, sample_dict):
         '''Returns SAMPLE_DICT in descending order by number of samples.'''
         return {k: v for k, v in sorted(sample_dict.items(),
                                         key=lambda item: item[1],
                                         reverse=True)}
+
+    def _trim_to_last_x_chars(self, string, x):
+        return string[-x:] if len(string) >= x else string