From de3dd7ff86da11fe67b0e0305da7bb29b0cc455b Mon Sep 17 00:00:00 2001
From: Christophe Bedard <bedard.christophe@gmail.com>
Date: Fri, 27 Dec 2019 12:35:04 -0500
Subject: [PATCH] Fix cb_durations script linter errors and move to scripts
 directory

---
 tracetools_analysis/setup.py                  |  2 +-
 .../tracetools_analysis/cb_durations.py       | 43 -------------
 .../tracetools_analysis/scripts/__init__.py   |  0
 .../scripts/cb_durations.py                   | 63 +++++++++++++++++++
 4 files changed, 64 insertions(+), 44 deletions(-)
 delete mode 100644 tracetools_analysis/tracetools_analysis/cb_durations.py
 create mode 100644 tracetools_analysis/tracetools_analysis/scripts/__init__.py
 create mode 100644 tracetools_analysis/tracetools_analysis/scripts/cb_durations.py

diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py
index 87896c1..f8203b4 100644
--- a/tracetools_analysis/setup.py
+++ b/tracetools_analysis/setup.py
@@ -43,7 +43,7 @@ setup(
         'console_scripts': [
             f'convert = {package_name}.convert:main',
             f'process = {package_name}.process:main',
-            f'cb_durations = {package_name}.cb_durations:main'
+            f'cb_durations = {package_name}.scripts.cb_durations:main'
         ],
     },
     license='Apache 2.0',
diff --git a/tracetools_analysis/tracetools_analysis/cb_durations.py b/tracetools_analysis/tracetools_analysis/cb_durations.py
deleted file mode 100644
index d60edd2..0000000
--- a/tracetools_analysis/tracetools_analysis/cb_durations.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /usr/bin/python
-
-import pandas as pd
-
-from tracetools_analysis.loading import load_file
-from tracetools_analysis.processor.ros2 import Ros2Handler
-from tracetools_analysis.utils.ros2 import Ros2DataModelUtil
-
-import sys
-
-removals = [
-    "void (", "rclcpp::", "std::shared_ptr<", ">", "::msg"
-]
-replaces = [
-    ("?)", "?")
-]
-
-
-def format_fn(fname: str):
-    for r in removals:
-        fname = fname.replace(r, "")
-    for a, b in replaces:
-        fname = fname.replace(a, b)
-
-    return fname
-
-def main():
-    if len(sys.argv) < 2:
-        print("Syntax: <tracefile>")
-        sys.exit(-1)
-
-    events = load_file(sys.argv[1])
-    handler = Ros2Handler.process(events)
-    du = Ros2DataModelUtil(handler.data)
-
-    stat_data = []
-    for ptr, name in du.get_callback_symbols().items():
-        durations = du.get_callback_durations(ptr)["duration"]        
-        stat_data.append((durations.count(), durations.sum(), durations.mean(), durations.std(), format_fn(name)))
-    
-    stat_df = pd.DataFrame(columns=["Count", "Sum", "Mean", "Std", "Name"], data=stat_data)
-    print(stat_df.sort_values(by="Sum", ascending=False).to_string())
-        
\ No newline at end of file
diff --git a/tracetools_analysis/tracetools_analysis/scripts/__init__.py b/tracetools_analysis/tracetools_analysis/scripts/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tracetools_analysis/tracetools_analysis/scripts/cb_durations.py b/tracetools_analysis/tracetools_analysis/scripts/cb_durations.py
new file mode 100644
index 0000000..b47c4b8
--- /dev/null
+++ b/tracetools_analysis/tracetools_analysis/scripts/cb_durations.py
@@ -0,0 +1,63 @@
+#! /usr/bin/python
+# Copyright 2019 Robert Bosch GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+
+import pandas as pd
+
+from tracetools_analysis.loading import load_file
+from tracetools_analysis.processor.ros2 import Ros2Handler
+from tracetools_analysis.utils.ros2 import Ros2DataModelUtil
+
+
+removals = [
+    'void (', 'rclcpp::', 'std::shared_ptr<', '>', '::msg'
+]
+replaces = [
+    ('?)', '?')
+]
+
+
+def format_fn(fname: str):
+    for r in removals:
+        fname = fname.replace(r, '')
+    for a, b in replaces:
+        fname = fname.replace(a, b)
+
+    return fname
+
+
+def main():
+    if len(sys.argv) < 2:
+        print('Syntax: <tracefile>')
+        sys.exit(-1)
+
+    events = load_file(sys.argv[1])
+    handler = Ros2Handler.process(events)
+    du = Ros2DataModelUtil(handler.data)
+
+    stat_data = []
+    for ptr, name in du.get_callback_symbols().items():
+        durations = du.get_callback_durations(ptr)['duration']
+        stat_data.append((
+            durations.count(),
+            durations.sum(),
+            durations.mean(),
+            durations.std(),
+            format_fn(name),
+        ))
+
+    stat_df = pd.DataFrame(columns=['Count', 'Sum', 'Mean', 'Std', 'Name'], data=stat_data)
+    print(stat_df.sort_values(by='Sum', ascending=False).to_string())