projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: io-hint: add missing include for off_t
[lttng-tools.git]
/
tests
/
stress
/
test_multi_sessions_per_uid_10app
diff --git
a/tests/stress/test_multi_sessions_per_uid_10app
b/tests/stress/test_multi_sessions_per_uid_10app
index c960957f216a217c1a5326911a88df0780455d06..68cfc457242d9c5c9538032f74eae301a340239e 100755
(executable)
--- a/
tests/stress/test_multi_sessions_per_uid_10app
+++ b/
tests/stress/test_multi_sessions_per_uid_10app
@@
-1,16
+1,9
@@
#!/bin/bash
#
#!/bin/bash
#
-# Copyright (C)
-
2013 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
#
#
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-# details.
+# SPDX-License-Identifier: LGPL-2.1-only
#
#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/..
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/..
@@
-24,6
+17,7
@@
NR_APP=10
NR_SESSION=5
NR_LOOP=1000
COREDUMP_FILE=$(cat /proc/sys/kernel/core_pattern)
NR_SESSION=5
NR_LOOP=1000
COREDUMP_FILE=$(cat /proc/sys/kernel/core_pattern)
+APPS_PID=
TEST_DESC="Stress test - $NR_SESSION sessions per UID with $NR_APP apps"
TEST_DESC="Stress test - $NR_SESSION sessions per UID with $NR_APP apps"
@@
-42,7
+36,7
@@
function enable_channel_per_uid()
function check_sessiond()
{
function check_sessiond()
{
- if [ -z "$(
pidof
lt-lttng-sessiond)" ]; then
+ if [ -z "$(
lttng_pgrep
lt-lttng-sessiond)" ]; then
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The session daemon died unexpectedly!!!"
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The session daemon died unexpectedly!!!"
@@
-56,21
+50,17
@@
function check_sessiond()
function start_sessiond()
{
function start_sessiond()
{
- local SESSIOND_BIN="lttng-sessiond"
-
validate_kernel_version
if [ $? -ne 0 ]; then
fail "Start session daemon"
BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
validate_kernel_version
if [ $? -ne 0 ]; then
fail "Start session daemon"
BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
- if [ -z $(
pidof
lt-$SESSIOND_BIN) ]; then
+ if [ -z $(
lttng_pgrep
lt-$SESSIOND_BIN) ]; then
# We have to start it like this so the ulimit -c is used by this
# process. Also, we collect any error message printed out.
# We have to start it like this so the ulimit -c is used by this
# process. Also, we collect any error message printed out.
- $TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --
consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE 2>&1 &
+ $TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --
background --consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE 2>&1
status=$?
status=$?
- # Wait for sessiond to bootstrap
- sleep 2
ok $status "Start session daemon"
fi
}
ok $status "Start session daemon"
fi
}
@@
-79,20
+69,20
@@
test_stress()
{
for b in $(seq 1 $NR_LOOP); do
for a in $(seq 1 $NR_SESSION); do
{
for b in $(seq 1 $NR_LOOP); do
for a in $(seq 1 $NR_SESSION); do
- create_lttng_session $SESSION_NAME-$a $TRACE_PATH
+ create_lttng_session
_ok
$SESSION_NAME-$a $TRACE_PATH
check_sessiond
enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
check_sessiond
check_sessiond
enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
check_sessiond
- enable_ust_lttng_event $SESSION_NAME-$a $EVENT_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME-$a $EVENT_NAME
check_sessiond
check_sessiond
- start_lttng_tracing $SESSION_NAME-$a
+ start_lttng_tracing
_ok
$SESSION_NAME-$a
check_sessiond
done
for a in $(seq 1 $NR_SESSION); do
check_sessiond
done
for a in $(seq 1 $NR_SESSION); do
- stop_lttng_tracing $SESSION_NAME-$a
+ stop_lttng_tracing
_ok
$SESSION_NAME-$a
check_sessiond
check_sessiond
- destroy_lttng_session $SESSION_NAME-$a
+ destroy_lttng_session
_ok
$SESSION_NAME-$a
check_sessiond
done
done
check_sessiond
done
done
@@
-103,7
+93,11
@@
test_stress()
function cleanup()
{
diag "Cleaning up!"
function cleanup()
{
diag "Cleaning up!"
- killall -9 $LAUNCH_APP
+ for p in ${APPS_PID}; do
+ kill -s SIGKILL ${p}
+ wait ${p} 2>/dev/null
+ done
+ APPS_PID=
stop_lttng_sessiond
}
stop_lttng_sessiond
}
@@
-111,10
+105,10
@@
function sighandler()
{
cleanup
rm $LOG_FILE
{
cleanup
rm $LOG_FILE
- exit 1
+ full_cleanup
}
}
-trap sighandler SIGINT
+trap sighandler SIGINT
SIGTERM
# Make sure we collect a coredump if possible.
ulimit -c unlimited
# Make sure we collect a coredump if possible.
ulimit -c unlimited
@@
-130,8
+124,9
@@
diag "Starting applications"
# Start NR_APP applications script that will spawn apps non stop.
./$TESTDIR/stress/$LAUNCH_APP $NR_APP &
# Start NR_APP applications script that will spawn apps non stop.
./$TESTDIR/stress/$LAUNCH_APP $NR_APP &
+APPS_PID="${APPS_PID} ${!}"
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d
-t tmp.test_multi_sess_per_uid_10app.XXXXXX
)
test_stress
out=$?
test_stress
out=$?
This page took
0.025347 seconds
and
4
git commands to generate.