diff --git a/ros2trace/ros2trace/api/__init__.py b/ros2trace/ros2trace/api/__init__.py index 4f139c1..cb4ecde 100644 --- a/ros2trace/ros2trace/api/__init__.py +++ b/ros2trace/ros2trace/api/__init__.py @@ -17,6 +17,7 @@ from tracetools_trace.tools import args from tracetools_trace.tools import lttng from tracetools_trace.tools import path +from tracetools_trace.tools import print_events_list def add_trace_arguments(parser): @@ -39,13 +40,13 @@ def init(args): if ust_enabled: print(f'UST tracing enabled ({len(ros_events)} events)') if args.list: - print(f'\tevents: {ros_events}') + print_events_list(ros_events) else: print('UST tracing disabled') if kernel_enabled: print(f'kernel tracing enabled ({len(kernel_events)} events)') if args.list: - print(f'\tevents: {kernel_events}') + print_events_list(kernel_events) else: print('kernel tracing disabled') diff --git a/tracetools_trace/tracetools_trace/tools/__init__.py b/tracetools_trace/tracetools_trace/tools/__init__.py index be009ca..79f0699 100644 --- a/tracetools_trace/tracetools_trace/tools/__init__.py +++ b/tracetools_trace/tracetools_trace/tools/__init__.py @@ -15,6 +15,7 @@ """Module for tracing.""" import sys +from typing import List def tracing_supported() -> bool: @@ -24,3 +25,11 @@ def tracing_supported() -> bool: It does not mean a tracer is installed. """ return sys.platform == 'linux' + + +def print_events_list( + events: List[str], + prefix: str = '\t', +) -> None: + for event in events: + print(f'{prefix}{event}') diff --git a/tracetools_trace/tracetools_trace/trace.py b/tracetools_trace/tracetools_trace/trace.py index f127038..18e809d 100644 --- a/tracetools_trace/tracetools_trace/trace.py +++ b/tracetools_trace/tracetools_trace/trace.py @@ -18,6 +18,7 @@ from tracetools_trace.tools import args from tracetools_trace.tools import lttng from tracetools_trace.tools import path +from tracetools_trace.tools import print_events_list def main(): @@ -33,13 +34,13 @@ def main(): if ust_enabled: print(f'UST tracing enabled ({len(ros_events)} events)') if params.list: - print(f'\tevents: {ros_events}') + print_events_list(ros_events) else: print('UST tracing disabled') if kernel_enabled: print(f'kernel tracing enabled ({len(kernel_events)} events)') if params.list: - print(f'\tevents: {kernel_events}') + print_events_list(kernel_events) else: print('kernel tracing disabled')