From 42823be8d5f4808e6f5a2adf0b737427865eb797 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Fri, 13 Mar 2020 18:26:31 -0400 Subject: [PATCH 1/2] Mention "userspace" events instead or "ROS UST" events Signed-off-by: Christophe Bedard --- tracetools_trace/tracetools_trace/tools/args.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracetools_trace/tracetools_trace/tools/args.py b/tracetools_trace/tracetools_trace/tools/args.py index 366d9e8..f290567 100644 --- a/tracetools_trace/tracetools_trace/tools/args.py +++ b/tracetools_trace/tracetools_trace/tools/args.py @@ -50,7 +50,7 @@ def add_arguments(parser: argparse.ArgumentParser) -> None: events_ust_arg = parser.add_argument( # type: ignore '-u', '--ust', nargs='*', dest='events_ust', metavar='EVENT', default=names.DEFAULT_EVENTS_ROS, - 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, ' 'provide this flag without any event name]') events_ust_arg.completer = DefaultArgValueCompleter(events_ust_arg) # type: ignore From 50ae44e73d3bbd817ff0e5fff23b2e68e4f68640 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Fri, 13 Mar 2020 18:27:08 -0400 Subject: [PATCH 2/2] Switch to DEFAULT_EVENTS_UST instead of DEFAULT_EVENTS_ROS Signed-off-by: Christophe Bedard --- tracetools_trace/tracetools_trace/tools/args.py | 2 +- tracetools_trace/tracetools_trace/tools/names.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tracetools_trace/tracetools_trace/tools/args.py b/tracetools_trace/tracetools_trace/tools/args.py index f290567..fab8cf1 100644 --- a/tracetools_trace/tracetools_trace/tools/args.py +++ b/tracetools_trace/tracetools_trace/tools/args.py @@ -49,7 +49,7 @@ def add_arguments(parser: argparse.ArgumentParser) -> None: help='path of the base directory for trace data (default: %(default)s)') events_ust_arg = parser.add_argument( # type: ignore '-u', '--ust', nargs='*', dest='events_ust', metavar='EVENT', - default=names.DEFAULT_EVENTS_ROS, + default=names.DEFAULT_EVENTS_UST, help='the userspace events to enable (default: see tracetools_trace.tools.names) ' '[to disable all UST events, ' 'provide this flag without any event name]') diff --git a/tracetools_trace/tracetools_trace/tools/names.py b/tracetools_trace/tracetools_trace/tools/names.py index ebed3d8..2750190 100644 --- a/tracetools_trace/tracetools_trace/tools/names.py +++ b/tracetools_trace/tracetools_trace/tools/names.py @@ -75,6 +75,8 @@ DEFAULT_EVENTS_ROS = [ 'ros2:callback_end', ] +DEFAULT_EVENTS_UST = DEFAULT_EVENTS_ROS + CONTEXT_TYPE_CONSTANTS_MAP = { 'pid': 'EVENT_CONTEXT_PID', 'procname': 'EVENT_CONTEXT_PROCNAME',