TESTDIR=$CURDIR/../../..
NR_APP_ITER=10
NR_ITER=1000000
-BIN_NAME="gen-ust-events"
+TESTAPP_PATH="$TESTDIR/utils/testapp"
+TESTAPP_NAME="gen-ust-events"
+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
SESSION_NAME="high-throughput"
EVENT_NAME="tp:tptest"
SESSIOND_CTRL_PORT=5342
TRACE_PATH=$(mktemp -d)
-NUM_TESTS=112
+NUM_TESTS=104
source $TESTDIR/utils/utils.sh
-if [ ! -x "$CURDIR/$BIN_NAME" ]; then
- BAIL_OUT "No UST nevents binary detected."
+if [ ! -x "$TESTAPP_BIN" ]; then
+ BAIL_OUT "No UST events binary detected."
fi
function set_bw_limit
# due to very slow communication between the consumer and relayd making
# the status reply from the consumer quite slow thus delaying the
# registration done message.
- LTTNG_UST_REGISTER_TIMEOUT=-1 ./$CURDIR/$BIN_NAME $NR_ITER & >/dev/null 2>&1
+ LTTNG_UST_REGISTER_TIMEOUT=-1 $TESTAPP_BIN $NR_ITER & >/dev/null 2>&1
done
}
-function wait_apps
-{
- while [ -n "$(pidof $BIN_NAME)" ]; do
- sleep 1
- done
- pass "Wait for applications to end"
-}
-
function test_high_throughput
{
NETWORK_URI="net://localhost"
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
start_lttng_tracing $SESSION_NAME
run_apps
- wait_apps
+ diag "Waiting for applications to end"
+ wait
+ pass "waiting done"
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
validate_event_count
{
# Catch sigint and try to cleanup limits
+ trap interrupt_cleanup SIGTERM
trap interrupt_cleanup SIGINT
BW_LIMITS=(3200 1600 800 400 200 100 50 25)
for BW in ${BW_LIMITS[@]};
do
diag "Test high-throughput with bandwidth limit set to ${BW}kbits"
+
set_bw_limit $BW
start_lttng_sessiond