From a028c28a2f3faa29dda3b58ab64831e2cf3ef40e Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 24 Oct 2017 11:54:20 -0400 Subject: [PATCH] Extract spawn sessiond to utils function Signed-off-by: Jonathan Rajotte --- .../test_ust_app_vs_ust_tools.py | 6 +----- lttng_ivc/utils/utils.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py b/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py index 17bac6c..7f00d51 100644 --- a/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py +++ b/lttng_ivc/tests/ust_app_vs_ust_tools/test_ust_app_vs_ust_tools.py @@ -118,11 +118,7 @@ def test_ust_app_tracing_available(tmpdir, ust_label, tools_label, should_trace) runtime_app.run("make V=1", cwd=app_path) # Start lttng-sessiond - # TODO: extract to utils function with a runtime as parameter - previous_handler = signal.signal(signal.SIGUSR1, lttng_sessiond_ready) - runtime_tools.spawn_subprocess("lttng-sessiond -vvv -S") - signal.sigtimedwait({signal.SIGUSR1}, 60) - previous_handler = signal.signal(signal.SIGUSR1, previous_handler) + utils.sessiond_spawn(runtime_tools) # Create session using mi to get path and session name runtime_tools.run('lttng create trace --output={}'.format(trace_path)) diff --git a/lttng_ivc/utils/utils.py b/lttng_ivc/utils/utils.py index 20a424d..aedb1fd 100644 --- a/lttng_ivc/utils/utils.py +++ b/lttng_ivc/utils/utils.py @@ -1,6 +1,20 @@ +import signal + def line_count(file_path): line_count = 0 with open(file_path) as f: for line in f: line_count += 1 return line_count + + +def __dummy_sigusr1_handler(): + pass + + +def sessiond_spawn(runtime): + previous_handler = signal.signal(signal.SIGUSR1, __dummy_sigusr1_handler) + sessiond = runtime.spawn_subprocess("lttng-sessiond -vvv -S") + signal.sigtimedwait({signal.SIGUSR1}, 60) + previous_handler = signal.signal(signal.SIGUSR1, previous_handler) + return sessiond -- 2.34.1