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

Merge branch '75-ros2-trace-exposes-ust-events-but-calls-them-ros-events' into 'master'

Browse source 
Generalize "ROS UST" events to just "userspace" in ros2 trace

Closes #75

See merge request micro-ROS/ros_tracing/ros2_tracing!158
This commit is contained in:
Christophe Bedard 2020-03-13 22:39:49 +00:00
commit 8b91e0bcc6
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tracetools_trace/tracetools_trace/tools/args.py
View file

@ -49,8 +49,8 @@ def add_arguments(parser: argparse.ArgumentParser) -> None:
help='path of the base directory for trace data (default: %(default)s)') help='path of the base directory for trace data (default: %(default)s)')
events_ust_arg = parser.add_argument( # type: ignore events_ust_arg = parser.add_argument( # type: ignore
'-u', '--ust', nargs='*', dest='events_ust', metavar='EVENT', '-u', '--ust', nargs='*', dest='events_ust', metavar='EVENT',
default=names.DEFAULT_EVENTS_ROS, default=names.DEFAULT_EVENTS_UST,
help='the ROS UST events to enable (default: see tracetools_trace.tools.names) ' help='the userspace events to enable (default: see tracetools_trace.tools.names) '
'[to disable all UST events, ' '[to disable all UST events, '
'provide this flag without any event name]') 'provide this flag without any event name]')
events_ust_arg.completer = DefaultArgValueCompleter(events_ust_arg) # type: ignore events_ust_arg.completer = DefaultArgValueCompleter(events_ust_arg) # type: ignore

2
tracetools_trace/tracetools_trace/tools/names.py
View file

@ -75,6 +75,8 @@ DEFAULT_EVENTS_ROS = [
'ros2:callback_end', 'ros2:callback_end',
] ]
DEFAULT_EVENTS_UST = DEFAULT_EVENTS_ROS
CONTEXT_TYPE_CONSTANTS_MAP = { CONTEXT_TYPE_CONSTANTS_MAP = {
'pid': 'EVENT_CONTEXT_PID', 'pid': 'EVENT_CONTEXT_PID',
'procname': 'EVENT_CONTEXT_PROCNAME', 'procname': 'EVENT_CONTEXT_PROCNAME',