Rename params and variables

This commit is contained in:
Christophe Bedard 2019-06-06 09:36:16 +02:00
parent d48ad12214
commit 0a76c66f9c
2 changed files with 10 additions and 10 deletions

View file

@ -7,11 +7,11 @@ sys.path = ['/usr/local/lib/python3.6/site-packages'] + sys.path
from lttng import * from lttng import *
from .names import DEFAULT_EVENTS_ROS, DEFAULT_EVENTS_KERNEL, DEFAULT_CONTEXT from .names import DEFAULT_EVENTS_ROS, DEFAULT_EVENTS_KERNEL, DEFAULT_CONTEXT
def lttng_setup(session_name, directory, ros_events=DEFAULT_EVENTS_ROS, kernel_events=DEFAULT_EVENTS_KERNEL, context_names=DEFAULT_CONTEXT): def lttng_setup(session_name, full_path, ros_events=DEFAULT_EVENTS_ROS, kernel_events=DEFAULT_EVENTS_KERNEL, context_names=DEFAULT_CONTEXT):
""" """
Setup LTTng session, with events and context Setup LTTng session, with events and context
:param session_name (str): the name of the session :param session_name (str): the name of the session
:param directory (str): the path of the main directory to write trace data to :param full_path (str): the full path to the main directory to write trace data to
:param ros_events (list(str)): list of ROS events to enable :param ros_events (list(str)): list of ROS events to enable
:param kernel_events (list(str)): list of kernel events to enable :param kernel_events (list(str)): list of kernel events to enable
:param context_names (list(str)): list of context elements to enable :param context_names (list(str)): list of context elements to enable
@ -48,7 +48,7 @@ def lttng_setup(session_name, directory, ros_events=DEFAULT_EVENTS_ROS, kernel_e
events_list_kernel = _create_events(kernel_events) events_list_kernel = _create_events(kernel_events)
# Session # Session
_create_session(session_name, directory) _create_session(session_name, full_path)
# Handles, channels, events # Handles, channels, events
handle_ust = None handle_ust = None
@ -104,17 +104,17 @@ def _create_events(event_names_list):
events_list.append(e) events_list.append(e)
return events_list return events_list
def _create_session(session_name, directory): def _create_session(session_name, full_path):
""" """
Create session from name and directory path, and check for errors Create session from name and full directory path, and check for errors
""" """
result = create(session_name, directory) result = create(session_name, full_path)
LTTNG_ERR_EXIST_SESS = 28 LTTNG_ERR_EXIST_SESS = 28
if result == -LTTNG_ERR_EXIST_SESS: if result == -LTTNG_ERR_EXIST_SESS:
# Sessions seem to persist, so if it already exists, # Sessions seem to persist, so if it already exists,
# just destroy it and try again # just destroy it and try again
lttng_destroy(session_name) lttng_destroy(session_name)
result = create(session_name, directory) result = create(session_name, full_path)
if result < 0: if result < 0:
raise RuntimeError(f'session creation failed: {strerror(result)}') raise RuntimeError(f'session creation failed: {strerror(result)}')

View file

@ -33,7 +33,7 @@ def main():
session_name = args.session_name session_name = args.session_name
base_path = args.path base_path = args.path
path = base_path + '/' + session_name full_path = base_path + '/' + session_name
ros_events = args.events_ust ros_events = args.events_ust
kernel_events = args.events_kernel kernel_events = args.events_kernel
@ -46,8 +46,8 @@ def main():
if args.list and kernel_enabled: if args.list and kernel_enabled:
print(f'\tevents: {kernel_events}') print(f'\tevents: {kernel_events}')
lttng_setup(session_name, path, ros_events=ros_events, kernel_events=kernel_events) lttng_setup(session_name, full_path, ros_events=ros_events, kernel_events=kernel_events)
print(f'writting tracing session to: {path}') print(f'writting tracing session to: {full_path}')
input('press enter to start...') input('press enter to start...')
lttng_start(session_name) lttng_start(session_name)