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
/
nprocesses
/
test_nprocesses
diff --git
a/tests/regression/ust/nprocesses/test_nprocesses
b/tests/regression/ust/nprocesses/test_nprocesses
index 84d0ff7a03a8d92eaaacd474975ede1d16086370..8b64e621a7365bca7fe6def99cec704a697b3fe5 100755
(executable)
--- a/
tests/regression/ust/nprocesses/test_nprocesses
+++ b/
tests/regression/ust/nprocesses/test_nprocesses
@@
-19,7
+19,7
@@
TEST_DESC="UST tracer - Generate $NUM_PROCESS process"
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
-NR_ITER=
1000
+NR_ITER=
-1 # infinite loop
NR_USEC_WAIT=1000000
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
NR_USEC_WAIT=1000000
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
@@
-28,6
+28,7
@@
SESSION_NAME="ust-nprocesses"
EVENT_NAME="tp:tptest"
TEST_WAIT_SEC=5
NUM_TESTS=9
EVENT_NAME="tp:tptest"
TEST_WAIT_SEC=5
NUM_TESTS=9
+APPS_PID=
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-43,41
+44,58
@@
print_test_banner "$TEST_DESC"
start_lttng_sessiond
start_lttng_sessiond
-# Start test
for 1000 seconds
+# Start test
s. Each is an infinite tracing loop.
+file_sync_after_first=$(mktemp -u)
+file_sync_before_last=$(mktemp -u)
+
+diag "Starting $NUM_PROCESS test applications"
for i in `seq 1 $NUM_PROCESS`
do
for i in `seq 1 $NUM_PROCESS`
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} \
+ --sync-before-last-event ${file_sync_before_last} >/dev/null 2>&1 &
+ APPS_PID="${APPS_PID} ${!}"
done
done
+diag "Waiting for applications to be registered to sessiond"
+
reg_app_count=0
while [ $reg_app_count -ne $NUM_PROCESS ]; do
listing=$($TESTDIR/../src/bin/lttng/$LTTNG_BIN list -u)
reg_app_count=$(echo -n $listing | sed "s#$TESTAPP_BIN#$TESTAPP_BIN\n#g" | grep "$TESTAPP_BIN" | wc -l)
done
reg_app_count=0
while [ $reg_app_count -ne $NUM_PROCESS ]; do
listing=$($TESTDIR/../src/bin/lttng/$LTTNG_BIN list -u)
reg_app_count=$(echo -n $listing | sed "s#$TESTAPP_BIN#$TESTAPP_BIN\n#g" | grep "$TESTAPP_BIN" | wc -l)
done
-pass "
Trace validation
"
+pass "
All applications are registered to sessiond
"
TRACE_PATH=$(mktemp -d)
TRACE_PATH=$(mktemp -d)
-create_lttng_session $SESSION_NAME $TRACE_PATH
+create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+
+enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+start_lttng_tracing_ok $SESSION_NAME
-enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-start_lttng_tracing $SESSION_NAME
+touch ${file_sync_before_last}
-diag "Sleeping $TEST_WAIT_SEC seconds for tracing to start everywhere"
-diag "Warning: this arbitrary time can make the test fail on slower system"
+# We don't validate whether the applications have traced here, rather
+# just that they registered to sessiond (above).
-sleep $TEST_WAIT_SEC
+stop_lttng_tracing_ok $SESSION_NAME
+destroy_lttng_session_ok $SESSION_NAME
-stop_lttng_tracing $SESSION_NAME
-destroy_lttng_session $SESSION_NAME
+#TODO: add trace validation.
rm -rf $TRACE_PATH
diag "Stopping all spawned applications"
rm -rf $TRACE_PATH
diag "Stopping all spawned applications"
-killall -q $TESTAPP_NAME >/dev/null 2>&1
-wait
+for p in ${APPS_PID}; do
+ kill ${p}
+ wait ${p} 2>/dev/null
+done
+APPS_PID=
pass "Stopped all spawned applications"
pass "Stopped all spawned applications"
+rm -f ${file_sync_after_first}
+rm -f ${file_sync_before_last}
+
stop_lttng_sessiond
stop_lttng_sessiond
This page took
0.025789 seconds
and
5
git commands to generate.