From 693d52f0ad2a580192556b223866d57d4d01fbbf Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Thu, 13 Jun 2019 16:20:06 +0200
Subject: [PATCH] Move time-related prints to entrypoint scripts

---
 tracetools_analysis/conversion/ctf.py | 9 ++-------
 tracetools_analysis/convert.py        | 6 +++++-
 tracetools_analysis/process.py        | 6 +++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tracetools_analysis/conversion/ctf.py b/tracetools_analysis/conversion/ctf.py
index 741e21c..78ca353 100644
--- a/tracetools_analysis/conversion/ctf.py
+++ b/tracetools_analysis/conversion/ctf.py
@@ -1,7 +1,5 @@
 # CTF to pickle conversion
 
-import time
-
 import babeltrace
 
 # List of ignored CTF fields
@@ -29,8 +27,6 @@ def ctf_to_pickle(trace_directory, target):
     # count_pid_matched = 0
     # traced = set()
 
-    start_time = time.time()
-
     # PID_KEYS = ['vpid', 'pid']
     for event in tc.events:
         count += 1
@@ -44,9 +40,8 @@ def ctf_to_pickle(trace_directory, target):
         pod = _ctf_event_to_pod(event)
         target.dump(pod)
         count_written += 1
-
-    time_diff = time.time() - start_time
-    print(f'{count_written} events in {time_diff * 1000:.2f} ms')
+    
+    return count_written
 
 
 def _ctf_event_to_pod(ctf_event):
diff --git a/tracetools_analysis/convert.py b/tracetools_analysis/convert.py
index 1cd1a5c..e1d149c 100644
--- a/tracetools_analysis/convert.py
+++ b/tracetools_analysis/convert.py
@@ -3,6 +3,7 @@
 
 import argparse
 from pickle import Pickler
+import time
 
 from tracetools_analysis.conversion import ctf
 
@@ -22,6 +23,9 @@ def main():
     trace_directory = args.trace_directory
     pickle_target_file = args.pickle_file
 
+    start_time = time.time()
     with open(pickle_target_file, 'wb') as f:
         p = Pickler(f, protocol=4)
-        ctf.ctf_to_pickle(trace_directory, p)
+        count = ctf.ctf_to_pickle(trace_directory, p)
+        time_diff = time.time() - start_time
+        print(f'converted {count} events in {time_diff * 1000:.2f} ms')
diff --git a/tracetools_analysis/process.py b/tracetools_analysis/process.py
index 1b9d6c9..ee375a4 100644
--- a/tracetools_analysis/process.py
+++ b/tracetools_analysis/process.py
@@ -3,6 +3,7 @@
 
 import argparse
 import pickle
+import time
 
 from tracetools_analysis.analysis import processor, to_pandas
 from tracetools_analysis.analysis import data_model
@@ -18,10 +19,13 @@ def main():
     args = parse_args()
 
     pickle_filename = args.pickle_file
+
+    start_time = time.time()
     with open(pickle_filename, 'rb') as f:
         events = _get_events_from_pickled_file(f)
-        print(f'imported {len(events)} events')
         p = processor.ros_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()