CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
NR_ITER=100
+NR_USEC_WAIT=100000
SESSION_NAME="buffers-uid"
-EVENT_NAME="ust_gen_nevents:tptest"
-BIN_NAME="gen-nevents"
+
+TESTAPP_PATH="$TESTDIR/utils/testapp"
+TESTAPP_NAME="gen-ust-events"
+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
+EVENT_NAME="tp:tptest"
NUM_TESTS=58
source $TESTDIR/utils/utils.sh
-if [ ! -x "$CURDIR/gen-nevents" ]; then
- BAIL_OUT "No UST nevents binary detected."
+if [ ! -x "$TESTAPP_BIN" ]; then
+ BAIL_OUT "No UST events binary detected."
fi
# MUST set TESTDIR before calling those functions
function wait_apps
{
diag "Waiting for applications to end..."
- while [ -n "$(pidof $BIN_NAME)" ]; do
+ while [ -n "$(pidof $TESTAPP_NAME)" ]; do
sleep 1
done
}
# BEFORE application is spawned
create_lttng_session $SESSION_NAME $TRACE_PATH
enable_channel_per_uid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+ enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
for i in `seq 1 5`; do
- ./$CURDIR/$BIN_NAME $NR_ITER & >/dev/null 2>&1
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & >/dev/null 2>&1
ok $? "Start application $i for tracing"
done
wait_apps
diag "Start multiple applications BEFORE tracing is started"
for i in `seq 1 5`; do
- ./$CURDIR/$BIN_NAME $NR_ITER & >/dev/null 2>&1
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & >/dev/null 2>&1
ok $? "Start application $i for tracing"
done
# BEFORE application is spawned
create_lttng_session $SESSION_NAME $TRACE_PATH
enable_channel_per_uid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+ enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
# At least hit one event
# BEFORE application is spawned
create_lttng_session $SESSION_NAME $TRACE_PATH
enable_channel_per_uid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+ enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
- ./$CURDIR/$BIN_NAME $NR_ITER
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
ok $? "Start application to trace"
stop_lttng_tracing $SESSION_NAME
diag "Start application BEFORE tracing is started"
- ./$CURDIR/$BIN_NAME $NR_ITER &
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
ok $? "Start application to trace"
# BEFORE application is spawned
create_lttng_session $SESSION_NAME $TRACE_PATH
enable_channel_per_uid $SESSION_NAME "channel0"
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+ enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
start_lttng_tracing $SESSION_NAME
# At least hit one event
ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4"
start_lttng_tracing $SESSION_NAME
- ./$CURDIR/$BIN_NAME $NR_ITER
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
ok $? "Start application to trace"
stop_lttng_tracing $SESSION_NAME
while [ $i -lt $TEST_COUNT ]; do
TRACE_PATH=$(mktemp -d)
${TESTS[$i]}
- if [ $? -ne 0 ]; then
- stop_lttng_sessiond
- exit 1
- fi
-
rm -rf $TRACE_PATH
let "i++"
done