projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: consolidate session creation with a uri parameter in utils.sh
[lttng-tools.git]
/
tests
/
regression
/
tools
/
streaming
/
test_high_throughput_limits
diff --git
a/tests/regression/tools/streaming/test_high_throughput_limits
b/tests/regression/tools/streaming/test_high_throughput_limits
index 7c253ba84755d1ebb2aa44d67dd0e3d85644af26..32c3f1f2b939abc060b0e256bc87b37eb56d3269 100755
(executable)
--- a/
tests/regression/tools/streaming/test_high_throughput_limits
+++ b/
tests/regression/tools/streaming/test_high_throughput_limits
@@
-22,7
+22,9
@@
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
NR_APP_ITER=10
NR_ITER=1000000
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
SESSION_NAME="high-throughput"
EVENT_NAME="tp:tptest"
SESSIOND_CTRL_PORT=5342
@@
-31,14
+33,12
@@
DEFAULT_IF="lo"
TRACE_PATH=$(mktemp -d)
TRACE_PATH=$(mktemp -d)
-NUM_TESTS=1
12
+NUM_TESTS=1
04
source $TESTDIR/utils/utils.sh
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
fi
function set_bw_limit
@@
-84,14
+84,6
@@
function create_lttng_session_with_uri
ok $? "Create session with uri $uri"
}
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
function run_apps
{
for i in `seq 1 $NR_APP_ITER`; do
@@
-99,29
+91,22
@@
function run_apps
# 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.
# 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
}
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
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
+ enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+ start_lttng_tracing_ok $SESSION_NAME
run_apps
run_apps
- wait_apps
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ diag "Waiting for applications to end"
+ wait
+ pass "waiting done"
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
validate_event_count
}
validate_event_count
}
@@
-171,6
+156,8
@@
function interrupt_cleanup()
plan_tests $NUM_TESTS
plan_tests $NUM_TESTS
+print_test_banner "$TEST_DESC"
+
if [ "$(id -u)" == "0" ]; then
isroot=1
else
if [ "$(id -u)" == "0" ]; then
isroot=1
else
@@
-181,12
+168,14
@@
skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
{
# Catch sigint and try to cleanup limits
{
# 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"
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
set_bw_limit $BW
start_lttng_sessiond
This page took
0.024919 seconds
and
4
git commands to generate.