niklas/ros2_tracing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use tracetools_launch instead of tracetools_trace in tracetools_test

Browse source
This commit is contained in:
Christophe Bedard 2019-06-24 16:29:00 +02:00
parent 70b9c780cb
commit 03eb5f7440
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tracetools_test/package.xml
View file

@ -26,7 +26,7 @@
<test_depend>launch_ros</test_depend> <test_depend>launch_ros</test_depend>
<test_depend>python3-pytest</test_depend> <test_depend>python3-pytest</test_depend>
<test_depend>tracetools</test_depend> <test_depend>tracetools</test_depend>
<test_depend>tracetools_trace</test_depend> <test_depend>tracetools_launch</test_depend>
<test_depend>tracetools_read</test_depend> <test_depend>tracetools_read</test_depend>
<export> <export>

27
tracetools_test/tracetools_test/utils.py
View file

@ -23,10 +23,10 @@ from typing import Tuple
from launch import LaunchDescription from launch import LaunchDescription
from launch import LaunchService from launch import LaunchService
from launch_ros import get_default_launch_description from launch_ros import get_default_launch_description
import launch_ros.actions from launch_ros.actions import Node
from tracetools_launch.trace import Trace
from tracetools_read.utils import DictEvent from tracetools_read.utils import DictEvent
from tracetools_read.utils import get_event_name from tracetools_read.utils import get_event_name
from tracetools_trace.tools import lttng
def run_and_trace( def run_and_trace(
@ -51,24 +51,29 @@ def run_and_trace(
session_name = f'{session_name_prefix}-{time.strftime("%Y%m%d%H%M%S")}' session_name = f'{session_name_prefix}-{time.strftime("%Y%m%d%H%M%S")}'
full_path = os.path.join(base_path, session_name) full_path = os.path.join(base_path, session_name)
lttng.lttng_init(session_name, full_path, ros_events=ros_events, kernel_events=kernel_events) launch_actions = []
# Add trace action
nodes = [] launch_actions.append(Trace(
session_name=session_name,
base_path=base_path,
events_ust=ros_events,
events_kernel=kernel_events
))
# Add nodes
for node_name in node_names: for node_name in node_names:
n = launch_ros.actions.Node( n = Node(
package=package_name, package=package_name,
node_executable=node_name, node_executable=node_name,
output='screen') output='screen',
nodes.append(n) )
ld = LaunchDescription(nodes) launch_actions.append(n)
ld = LaunchDescription(launch_actions)
ls = LaunchService() ls = LaunchService()
ls.include_launch_description(get_default_launch_description()) ls.include_launch_description(get_default_launch_description())
ls.include_launch_description(ld) ls.include_launch_description(ld)
exit_code = ls.run() exit_code = ls.run()
lttng.lttng_fini(session_name)
return exit_code, full_path return exit_code, full_path