From dd402ed1ce253c8c56e0f51b0d8f6452b9b4f29d Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Fri, 14 Jun 2019 11:44:46 +0200
Subject: [PATCH] Extract pickle-loading function

---
 tracetools_analysis/analysis/load.py | 20 ++++++++++++++++++++
 tracetools_analysis/process.py       | 24 ++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 tracetools_analysis/analysis/load.py

diff --git a/tracetools_analysis/analysis/load.py b/tracetools_analysis/analysis/load.py
new file mode 100644
index 0000000..053d058
--- /dev/null
+++ b/tracetools_analysis/analysis/load.py
@@ -0,0 +1,20 @@
+import pickle
+
+
+def load_pickle(pickle_file_path):
+    """
+    Load pickle file containing converted trace events.
+
+    :param pickle_file_path (str): the path to the pickle file to load
+    :return list(dict): the list of events (dicts) read from the file
+    """
+    events = []
+    with open(pickle_file_path, 'rb') as f:
+        p = pickle.Unpickler(f)
+        while True:
+            try:
+                events.append(p.load())
+            except EOFError:
+                break  # we're done
+
+    return events
diff --git a/tracetools_analysis/process.py b/tracetools_analysis/process.py
index cba3cc4..029a476 100644
--- a/tracetools_analysis/process.py
+++ b/tracetools_analysis/process.py
@@ -2,9 +2,9 @@
 # Entrypoint/script to process events from a pickle file to build a ROS model
 
 import argparse
-import pickle
 import time
 
+from tracetools_analysis.analysis import load
 from tracetools_analysis.analysis import ros2_processor
 
 
@@ -22,21 +22,9 @@ def main():
     pickle_filename = args.pickle_file
 
     start_time = time.time()
-    with open(pickle_filename, 'rb') as f:
-        events = _get_events_from_pickled_file(f)
-        p = ros2_processor.ros2_process(events)
-        time_diff = time.time() - start_time
-        print(f'processed {len(events)} events in {time_diff * 1000:.2f} ms')
+    events = load.load_pickle(pickle_filename)
+    processor = ros2_processor.ros2_process(events)
+    time_diff = time.time() - start_time
+    print(f'processed {len(events)} events in {time_diff * 1000:.2f} ms')
 
-    p.get_data_model().print_model()
-
-
-def _get_events_from_pickled_file(file):
-    p = pickle.Unpickler(file)
-    events = []
-    while True:
-        try:
-            events.append(p.load())
-        except EOFError:
-            break  # we're done
-    return events
+    processor.get_data_model().print_model()