Merge branch 'master' into executor-profiling

tracetools_analysis/launch/pingpong.launch.py

@@ -0,0 +1,39 @@
+# 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.
+
+"""Example launch file for a callback duration analysis."""
+
+from launch import LaunchDescription
+from launch_ros.actions import Node
+from tracetools_launch.action import Trace
+
+
+def generate_launch_description():
+    return LaunchDescription([
+        Trace(
+            session_name='pingpong',
+        ),
+        Node(
+            package='tracetools_test',
+            node_executable='test_ping',
+            arguments=['do_more'],
+            output='screen',
+        ),
+        Node(
+            package='tracetools_test',
+            node_executable='test_pong',
+            arguments=['do_more'],
+            output='screen',
+        ),
+    ])

tracetools_analysis/package.xml

@@ -10,8 +10,8 @@
   <author email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</author>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
 
-  <exec_depend>tracetools_read</exec_depend>
-  <exec_depend>python3-pandas</exec_depend>
+  <depend>tracetools_read</depend>
+  <depend>python3-pandas</depend>
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>

tracetools_analysis/setup.cfg

@@ -2,3 +2,5 @@
 script-dir=$base/lib/tracetools_analysis
 [install]
 install-scripts=$base/lib/tracetools_analysis
+[tool:pytest]
+addopts = --ignore=test/tracetools_analysis/

tracetools_analysis/tracetools_analysis/conversion/ctf.py

@@ -16,8 +16,8 @@
 
 from pickle import Pickler
 
-from tracetools_read import event_to_dict
-from tracetools_read import get_trace_ctf_events
+from tracetools_read.trace import event_to_dict
+from tracetools_read.trace import get_trace_ctf_events
 
 
 def ctf_to_pickle(trace_directory: str, target: Pickler) -> int: