From a8fe961bb0ffa3c2f1f1d93d1ccee97ec359bc9c Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Sun, 23 Jun 2019 16:02:48 +0200
Subject: [PATCH] Extract args parsing method

---
 tracetools_trace/tools/args.py | 34 ++++++++++++++++++++++++++
 tracetools_trace/trace.py      | 44 +++++++---------------------------
 2 files changed, 42 insertions(+), 36 deletions(-)
 create mode 100644 tracetools_trace/tools/args.py

diff --git a/tracetools_trace/tools/args.py b/tracetools_trace/tools/args.py
new file mode 100644
index 0000000..e9aaa5b
--- /dev/null
+++ b/tracetools_trace/tools/args.py
@@ -0,0 +1,34 @@
+import argparse
+import time
+
+from . import names
+
+
+def parse_args():
+    """
+    Parse args for tracing.
+    """
+    parser = argparse.ArgumentParser(description='Setup and launch an LTTng tracing session.')
+    parser.add_argument(
+        '--session-name', '-s', dest='session_name',
+        default=f'session-{time.strftime("%Y%m%d%H%M%S")}',
+        help='the name of the tracing session (default: session-YYYYMMDDHHMMSS)')
+    parser.add_argument(
+        '--path', '-p', dest='path',
+        default='/tmp',
+        help='path of the base directory for trace data (default: %(default)s)')
+    parser.add_argument(
+        '--ust', '-u', nargs='*', dest='events_ust', default=names.DEFAULT_EVENTS_ROS,
+        help='the ROS UST events to enable (default: all events) '
+            '[to disable all UST events, '
+            'provide this flag without any event name]')
+    parser.add_argument(
+        '--kernel', '-k', nargs='*', dest='events_kernel',
+        default=names.DEFAULT_EVENTS_KERNEL,
+        help='the kernel events to enable (default: all events) '
+            '[to disable all UST events, '
+            'provide this flag without any event name]')
+    parser.add_argument(
+        '--list', '-l', dest='list', action='store_true',
+        help='display lists of enabled events (default: %(default)s)')
+    return parser.parse_args()
diff --git a/tracetools_trace/trace.py b/tracetools_trace/trace.py
index 166ca99..16639dc 100644
--- a/tracetools_trace/trace.py
+++ b/tracetools_trace/trace.py
@@ -1,61 +1,33 @@
 #!/usr/bin/env python3
 # Entrypoint/script to setup and start an LTTng tracing session
 
-import argparse
 import os
-import time
 
+from tracetools_trace.tools import args
 from tracetools_trace.tools import lttng
 from tracetools_trace.tools import names
 
 
-def parse_args():
-    parser = argparse.ArgumentParser(description='Setup and launch an LTTng tracing session.')
-    parser.add_argument(
-        '--session-name', '-s', dest='session_name',
-        default=f'session-{time.strftime("%Y%m%d%H%M%S")}',
-        help='the name of the tracing session (default: session-YYYYMMDDHHMMSS)')
-    parser.add_argument(
-        '--path', '-p', dest='path',
-        default='/tmp',
-        help='path of the base directory for trace data (default: %(default)s)')
-    parser.add_argument(
-        '--ust', '-u', nargs='*', dest='events_ust', default=names.DEFAULT_EVENTS_ROS,
-        help='the ROS UST events to enable (default: all events) '
-            '[to disable all UST events, '
-            'provide this flag without any event name]')
-    parser.add_argument(
-        '--kernel', '-k', nargs='*', dest='events_kernel',
-        default=names.DEFAULT_EVENTS_KERNEL,
-        help='the kernel events to enable (default: all events) '
-            '[to disable all UST events, '
-            'provide this flag without any event name]')
-    parser.add_argument(
-        '--list', '-l', dest='list', action='store_true',
-        help='display lists of enabled events (default: %(default)s)')
-    return parser.parse_args()
-
-
 def main():
-    args = parse_args()
+    params = args.parse_args()
 
-    session_name = args.session_name
-    base_path = args.path
+    session_name = params.session_name
+    base_path = params.path
     full_path = os.path.join(base_path, session_name)
-    ros_events = args.events_ust
-    kernel_events = args.events_kernel
+    ros_events = params.events_ust
+    kernel_events = params.events_kernel
 
     ust_enabled = len(ros_events) > 0
     kernel_enabled = len(kernel_events) > 0
     if ust_enabled:
         print(f'UST tracing enabled ({len(ros_events)} events)')
-        if args.list:
+        if params.list:
             print(f'\tevents: {ros_events}')
     else:
         print('UST tracing disabled')
     if kernel_enabled:
         print(f'kernel tracing enabled ({len(kernel_events)} events)')
-        if args.list:
+        if params.list:
             print(f'\tevents: {kernel_events}')
     else:
         print('kernel tracing disabled')