From d2641c2a0b464fd8d9d9a4fe47a8878fdfb56371 Mon Sep 17 00:00:00 2001 From: Shravan Deva Date: Fri, 25 Apr 2025 02:52:32 +0530 Subject: [PATCH 1/2] Fix pluralization in ros2 trace output Signed-off-by: Shravan Deva --- tracetools_trace/tracetools_trace/trace.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tracetools_trace/tracetools_trace/trace.py b/tracetools_trace/tracetools_trace/trace.py index 0efa6741..a35fa041 100644 --- a/tracetools_trace/tracetools_trace/trace.py +++ b/tracetools_trace/tracetools_trace/trace.py @@ -45,25 +45,29 @@ def _display_info( display_list: bool, ) -> None: if ros_events: - print(f'userspace tracing enabled ({len(ros_events)} events)') + event_str = 'events' if len(ros_events) > 1 else 'event' + print(f'userspace tracing enabled ({len(ros_events)} {event_str})') if display_list: print_names_list(ros_events) else: print('userspace tracing disabled') if kernel_events: - print(f'kernel tracing enabled ({len(kernel_events)} events)') + event_str = 'events' if len(kernel_events) > 1 else 'event' + print(f'kernel tracing enabled ({len(kernel_events)} {event_str})') if display_list: print_names_list(kernel_events) else: print('kernel tracing disabled') if syscalls: - print(f'syscall tracing enabled ({len(syscalls)} syscalls)') + syscall_str = 'syscalls' if len(syscalls) > 1 else 'syscall' + print(f'syscall tracing enabled ({len(syscalls)} {syscall_str})') if display_list: print_names_list(syscalls) else: print('syscalls tracing disabled') if len(context_fields) > 0: - print(f'context ({len(context_fields)} fields)') + field_str = 'fields' if len(context_fields) > 1 else 'field' + print(f'context tracing enabled ({len(context_fields)} {field_str})') if display_list: print_names_list(context_fields) From b00c4016d404b3a3828843553f4428cda8e7a2d4 Mon Sep 17 00:00:00 2001 From: Shravan Deva Date: Fri, 25 Apr 2025 12:22:52 +0530 Subject: [PATCH 2/2] Update output of ros2 trace command Signed-off-by: Shravan Deva --- tracetools_trace/tracetools_trace/trace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracetools_trace/tracetools_trace/trace.py b/tracetools_trace/tracetools_trace/trace.py index a35fa041..f12c3b93 100644 --- a/tracetools_trace/tracetools_trace/trace.py +++ b/tracetools_trace/tracetools_trace/trace.py @@ -67,7 +67,7 @@ def _display_info( print('syscalls tracing disabled') if len(context_fields) > 0: field_str = 'fields' if len(context_fields) > 1 else 'field' - print(f'context tracing enabled ({len(context_fields)} {field_str})') + print(f'context ({len(context_fields)} {field_str})') if display_list: print_names_list(context_fields)