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
-print_test_banner "$TEST_DESC"
-
-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
ok $? "Create session with uri $uri"
}
-function enable_lttng_consumer
-{
- uri=$1
- # Create session with custom URI
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-consumer -u $uri >/dev/null 2>&1
- ok $? "Enable consumer with uri $uri"
-}
-
function run_apps
{
for i in `seq 1 $NR_APP_ITER`; do
# 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"
create_lttng_session_with_uri $SESSION_NAME $NETWORK_URI
- enable_lttng_consumer $NETWORK_URI
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
plan_tests $NUM_TESTS
+print_test_banner "$TEST_DESC"
+
if [ "$(id -u)" == "0" ]; then
isroot=1
else