Merge branch 'ros2trace' into 'master'

Use lttng init and fini methods

See merge request micro-ROS/ros2_tracing!15
This commit is contained in:
Christophe Bedard 2019-06-24 06:29:48 +00:00
commit 4d434fa182

View file

@ -27,12 +27,7 @@ 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 import launch_ros.actions
from tracetools_trace.tools.lttng import ( from tracetools_trace.tools import lttng
lttng_destroy,
lttng_setup,
lttng_start,
lttng_stop,
)
def run_and_trace( def run_and_trace(
@ -57,8 +52,7 @@ 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_setup(session_name, full_path, ros_events=ros_events, kernel_events=kernel_events) lttng.lttng_init(session_name, full_path, ros_events=ros_events, kernel_events=kernel_events)
lttng_start(session_name)
nodes = [] nodes = []
for node_name in node_names: for node_name in node_names:
@ -74,8 +68,7 @@ def run_and_trace(
exit_code = ls.run() exit_code = ls.run()
lttng_stop(session_name) lttng.lttng_fini(session_name)
lttng_destroy(session_name)
return exit_code, full_path return exit_code, full_path