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

Merge branch 'better-tracepoints-list' into 'master'

Browse source 
Make list of enabled events more readable

See merge request micro-ROS/ros_tracing/ros2_tracing!109
This commit is contained in:
Christophe Bedard 2019-11-17 20:37:45 +00:00
commit b1fb7b63dc
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ros2trace/ros2trace/api/__init__.py
View file

@ -17,6 +17,7 @@
from tracetools_trace.tools import args from tracetools_trace.tools import args
from tracetools_trace.tools import lttng from tracetools_trace.tools import lttng
from tracetools_trace.tools import path from tracetools_trace.tools import path
from tracetools_trace.tools import print_events_list
def add_trace_arguments(parser): def add_trace_arguments(parser):
@ -39,13 +40,13 @@ def init(args):
if ust_enabled: if ust_enabled:
print(f'UST tracing enabled ({len(ros_events)} events)') print(f'UST tracing enabled ({len(ros_events)} events)')
if args.list: if args.list:
print(f'\tevents: {ros_events}') print_events_list(ros_events)
else: else:
print('UST tracing disabled') print('UST tracing disabled')
if kernel_enabled: if kernel_enabled:
print(f'kernel tracing enabled ({len(kernel_events)} events)') print(f'kernel tracing enabled ({len(kernel_events)} events)')
if args.list: if args.list:
print(f'\tevents: {kernel_events}') print_events_list(kernel_events)
else: else:
print('kernel tracing disabled') print('kernel tracing disabled')

9
tracetools_trace/tracetools_trace/tools/__init__.py
View file

@ -15,6 +15,7 @@
"""Module for tracing.""" """Module for tracing."""
import sys import sys
from typing import List
def tracing_supported() -> bool: def tracing_supported() -> bool:
@ -24,3 +25,11 @@ def tracing_supported() -> bool:
It does not mean a tracer is installed. It does not mean a tracer is installed.
""" """
return sys.platform == 'linux' return sys.platform == 'linux'
def print_events_list(
events: List[str],
prefix: str = '\t',
) -> None:
for event in events:
print(f'{prefix}{event}')

5
tracetools_trace/tracetools_trace/trace.py
View file

@ -18,6 +18,7 @@
from tracetools_trace.tools import args from tracetools_trace.tools import args
from tracetools_trace.tools import lttng from tracetools_trace.tools import lttng
from tracetools_trace.tools import path from tracetools_trace.tools import path
from tracetools_trace.tools import print_events_list
def main(): def main():
@ -33,13 +34,13 @@ def main():
if ust_enabled: if ust_enabled:
print(f'UST tracing enabled ({len(ros_events)} events)') print(f'UST tracing enabled ({len(ros_events)} events)')
if params.list: if params.list:
print(f'\tevents: {ros_events}') print_events_list(ros_events)
else: else:
print('UST tracing disabled') print('UST tracing disabled')
if kernel_enabled: if kernel_enabled:
print(f'kernel tracing enabled ({len(kernel_events)} events)') print(f'kernel tracing enabled ({len(kernel_events)} events)')
if params.list: if params.list:
print(f'\tevents: {kernel_events}') print_events_list(kernel_events)
else: else:
print('kernel tracing disabled') print('kernel tracing disabled')