projects
/
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
[lttng-tools.git]
/
tests
/
regression
/
ust
/
buffers-pid
/
test_buffers_pid
diff --git
a/tests/regression/ust/buffers-pid/test_buffers_pid
b/tests/regression/ust/buffers-pid/test_buffers_pid
index c7ee2d86c784f02fa0b1e3a8ac366c762c99bf88..2ca4a02979adbd0ceea0dfb48b670b0c870d8c00 100755
(executable)
--- a/
tests/regression/ust/buffers-pid/test_buffers_pid
+++ b/
tests/regression/ust/buffers-pid/test_buffers_pid
@@
-26,7
+26,7
@@
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
-NUM_TESTS=5
8
+NUM_TESTS=5
9
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-45,14
+45,6
@@
function enable_channel_per_pid()
ok $? "Enable channel $channel_name per PID for session $sess_name"
}
ok $? "Enable channel $channel_name per PID for session $sess_name"
}
-function wait_apps
-{
- diag "Waiting for applications to end..."
- while [ -n "$(pidof $TESTAPP_NAME)" ]; do
- sleep 1
- done
-}
-
test_after_multiple_apps() {
local out
local i
test_after_multiple_apps() {
local out
local i
@@
-60,18
+52,19
@@
test_after_multiple_apps() {
diag "Start multiple applications AFTER tracing is started"
# BEFORE application is spawned
diag "Start multiple applications AFTER tracing is started"
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
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
for i in `seq 1 5`; do
for i in `seq 1 5`; do
- $TESTAPP_BIN
$NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
+ $TESTAPP_BIN
-i $NR_ITER -w $NR_USEC_WAIT >/dev/null 2>&1 &
ok $? "Start application $i for tracing"
done
ok $? "Start application $i for tracing"
done
+ wait
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
+ destroy_lttng_session
_ok
$SESSION_NAME
trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
@@
-81,25
+74,39
@@
test_after_multiple_apps() {
test_before_multiple_apps() {
local out
local i
test_before_multiple_apps() {
local out
local i
+ local file_sync_after_first=$(mktemp -u)
+ local file_sync_before_last=$(mktemp -u)
diag "Start multiple applications BEFORE tracing is started"
for i in `seq 1 5`; do
diag "Start multiple applications BEFORE tracing is started"
for i in `seq 1 5`; do
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & >/dev/null 2>&1
+ $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+ --sync-after-first-event ${file_sync_after_first}_${i} \
+ --sync-before-last-event ${file_sync_before_last}_${i} >/dev/null 2>&1 &
ok $? "Start application $i for tracing"
done
# BEFORE application is spawned
ok $? "Start application $i for tracing"
done
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
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
+
+ for i in `seq 1 5`; do
+ touch ${file_sync_before_last}_${i}
+ done
- # At least hit one event
- sleep 2
+ diag "Waiting for applications to end"
+ wait
+ pass "Waiting done"
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
+
+ for i in `seq 1 5`; do
+ rm -f ${file_sync_after_first}_${i}
+ rm -f ${file_sync_before_last}_${i}
+ done
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
@@
-112,8
+119,6
@@
test_before_multiple_apps() {
out=0
fi
out=0
fi
- wait_apps
-
return $out
}
return $out
}
@@
-123,16
+128,17
@@
test_after_app() {
diag "Start application AFTER tracing is started"
# BEFORE application is spawned
diag "Start application AFTER tracing is started"
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
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
- $TESTAPP_BIN
$NR_ITER $NR_USEC_WAIT
+ $TESTAPP_BIN
-i $NR_ITER -w $NR_USEC_WAIT &
ok $? "Start application to trace"
ok $? "Start application to trace"
+ wait
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
+ destroy_lttng_session
_ok
$SESSION_NAME
trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
@@
-141,24
+147,33
@@
test_after_app() {
test_before_app() {
local out
test_before_app() {
local out
+ local file_sync_after_first=$(mktemp -u)
+ local file_sync_before_last=$(mktemp -u)
diag "Start application BEFORE tracing is started"
# BEFORE application is spawned
diag "Start application BEFORE tracing is started"
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME "channel0"
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+ $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+ --sync-after-first-event ${file_sync_after_first} \
+ --sync-before-last-event ${file_sync_before_last} &
ok $? "Start application to trace"
ok $? "Start application to trace"
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing_ok $SESSION_NAME
+
+ touch ${file_sync_before_last}
+
+ wait
- wait ${!}
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ rm -f ${file_sync_after_first}
+ rm -f ${file_sync_before_last}
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l)
if [ $out -eq 0 ]; then
@@
-180,7
+195,7
@@
test_multiple_channels() {
diag "Start with multiple channels"
# BEFORE application is spawned
diag "Start with multiple channels"
# BEFORE application is spawned
- create_lttng_session $SESSION_NAME $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME $TRACE_PATH
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel1"
enable_channel_per_pid $SESSION_NAME "channel2"
enable_channel_per_pid $SESSION_NAME "channel0"
enable_channel_per_pid $SESSION_NAME "channel1"
enable_channel_per_pid $SESSION_NAME "channel2"
@@
-197,16
+212,17
@@
test_multiple_channels() {
ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel3"
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel4 -s $SESSION_NAME -u >/dev/null 2>&1
ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4"
ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel3"
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel4 -s $SESSION_NAME -u >/dev/null 2>&1
ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4"
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing
_ok
$SESSION_NAME
- $TESTAPP_BIN
$NR_ITER $NR_USEC_WAIT
+ $TESTAPP_BIN
-i $NR_ITER -w $NR_USEC_WAIT &
ok $? "Start application to trace"
ok $? "Start application to trace"
+ wait
- stop_lttng_tracing $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
out=$?
trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH
out=$?
- destroy_lttng_session $SESSION_NAME
+ destroy_lttng_session
_ok
$SESSION_NAME
return $out
}
return $out
}
This page took
0.02784 seconds
and
5
git commands to generate.