projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gen-ust-events: use options instead of arguments
[deliverable/lttng-tools.git]
/
tests
/
regression
/
ust
/
periodical-metadata-flush
/
test_periodical_metadata_flush
diff --git
a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
index e4199652bce1a456333ca0d88cbe869a5b590f96..bfc3b2091de8bb158914e5a8c596f4753dc7dfe3 100755
(executable)
--- a/
tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/
tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@
-27,7
+27,8
@@
SESSION_NAME="periodical-flush"
EVENT_NAME="tp:tptest"
BIN_NAME="gen-nevents"
NUM_TESTS=38
EVENT_NAME="tp:tptest"
BIN_NAME="gen-nevents"
NUM_TESTS=38
-APP_TMP_FILE="/tmp/lttng_test_ust.42.file"
+APP_TMP_FILE=$(mktemp -u)
+APPS_PID=
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-105,8
+106,10
@@
function check_app_tmp_file()
function start_trace_app()
{
# Start application with a temporary file.
function start_trace_app()
{
# Start application with a temporary file.
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $APP_TMP_FILE &
- ok $? "Start application to trace"
+ $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $APP_TMP_FILE &
+ ret=$?
+ APPS_PID="${APPS_PID} ${!}"
+ ok $ret "Start application to trace"
}
function start_check_trace_app()
}
function start_check_trace_app()
@@
-115,16
+118,27
@@
function start_check_trace_app()
check_app_tmp_file
}
check_app_tmp_file
}
+
+function wait_trace_apps()
+{
+ for p in ${APPS_PID}; do
+ wait ${p} 2>/dev/null
+ done
+ APPS_PID=
+}
+
test_after_app_pid() {
local out
test_after_app_pid() {
local out
+ APPS_PID=
+
diag "Start application AFTER tracing is started"
diag "Start application AFTER tracing is started"
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_metadata_per_pid $SESSION_NAME
enable_channel_per_pid $SESSION_NAME "channel0"
enable_metadata_per_pid $SESSION_NAME
enable_channel_per_pid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
- start_lttng_tracing $SESSION_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
+ start_lttng_tracing
_ok
$SESSION_NAME
# Start application after tracing
start_check_trace_app
# Start application after tracing
start_check_trace_app
@@
-133,7
+147,9
@@
test_after_app_pid() {
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
- killall -SIGSTOP -q $TESTAPP_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGSTOP ${p}
+ done
# Give time to the consumer to write inflight data.
sleep 2
# Give time to the consumer to write inflight data.
sleep 2
@@
-141,11
+157,14
@@
test_after_app_pid() {
validate_trace
out=$?
validate_trace
out=$?
- killall -SIGKILL -q $TESTAPP_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGKILL ${p}
+ wait ${p} 2>/dev/null
+ done
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
- wait
+ wait
_trace_apps
return $out
}
return $out
}
@@
-154,16
+173,18
@@
test_before_app_pid() {
local out
local tmp_file="/tmp/lttng_test_ust.42.file"
local out
local tmp_file="/tmp/lttng_test_ust.42.file"
+ APPS_PID=
+
diag "Start application BEFORE tracing is started"
start_trace_app
# Start application before tracing
diag "Start application BEFORE tracing is started"
start_trace_app
# Start application before tracing
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_metadata_per_pid $SESSION_NAME
enable_channel_per_pid $SESSION_NAME "channel0"
enable_metadata_per_pid $SESSION_NAME
enable_channel_per_pid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
- start_lttng_tracing $SESSION_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
+ start_lttng_tracing
_ok
$SESSION_NAME
check_app_tmp_file
# Let the application at least perform a flush!
check_app_tmp_file
# Let the application at least perform a flush!
@@
-172,7
+193,9
@@
test_before_app_pid() {
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
- killall -SIGSTOP -q $TESTAPP_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGSTOP ${p}
+ done
# Give time to the consumer to write inflight data.
sleep 2
# Give time to the consumer to write inflight data.
sleep 2
@@
-180,11
+203,15
@@
test_before_app_pid() {
validate_trace
out=$?
validate_trace
out=$?
- killall -SIGKILL -q $TESTAPP_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGKILL ${p}
+ wait ${p} 2>/dev/null
+ done
+
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
- wait
+ wait
_trace_apps
return $out
}
return $out
}
@@
-192,13
+219,15
@@
test_before_app_pid() {
test_after_app_uid() {
local out
test_after_app_uid() {
local out
+ APPS_PID=
+
diag "Start application AFTER tracing is started"
diag "Start application AFTER tracing is started"
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_metadata_per_uid $SESSION_NAME
enable_channel_per_uid $SESSION_NAME "channel0"
enable_metadata_per_uid $SESSION_NAME
enable_channel_per_uid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
- start_lttng_tracing $SESSION_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
+ start_lttng_tracing
_ok
$SESSION_NAME
# Start application after tracing
start_check_trace_app
# Start application after tracing
start_check_trace_app
@@
-207,7
+236,10
@@
test_after_app_uid() {
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
- killall -SIGSTOP -q $TESTAPP_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGSTOP ${p}
+ done
+
# Give time to the consumer to write inflight data.
sleep 2
# Give time to the consumer to write inflight data.
sleep 2
@@
-215,11
+247,14
@@
test_after_app_uid() {
validate_trace
out=$?
validate_trace
out=$?
- killall -SIGKILL -q $TESTAPP_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGKILL ${p}
+ wait ${p} 2>/dev/null
+ done
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
- wait
+ wait
_trace_apps
return $out
}
return $out
}
@@
-227,16
+262,18
@@
test_after_app_uid() {
test_before_app_uid() {
local out
test_before_app_uid() {
local out
+ APPS_PID=
+
diag "Start application BEFORE tracing is started"
# Start application before tracing
start_trace_app
diag "Start application BEFORE tracing is started"
# Start application before tracing
start_trace_app
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_metadata_per_uid $SESSION_NAME
enable_channel_per_uid $SESSION_NAME "channel0"
enable_metadata_per_uid $SESSION_NAME
enable_channel_per_uid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
- start_lttng_tracing $SESSION_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
+ start_lttng_tracing
_ok
$SESSION_NAME
check_app_tmp_file
# Let the application at least perform a flush!
check_app_tmp_file
# Let the application at least perform a flush!
@@
-245,7
+282,9
@@
test_before_app_uid() {
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
# Make sure the application does not generate any more data,
# thus ensuring that we are not flushing a packet concurrently
# with validate_trace.
- killall -SIGSTOP -q $TESTAPP_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGSTOP ${p}
+ done
# Give time to the consumer to write inflight data.
sleep 2
# Give time to the consumer to write inflight data.
sleep 2
@@
-253,11
+292,14
@@
test_before_app_uid() {
validate_trace
out=$?
validate_trace
out=$?
- killall -SIGKILL -q $TESTAPP_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ for p in ${APPS_PID}; do
+ kill -s SIGKILL ${p}
+ wait ${p} 2>/dev/null
+ done
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
- wait
+ wait
_trace_apps
return $out
}
return $out
}
This page took
0.036141 seconds
and
5
git commands to generate.