projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
userspace-probe: replace explicit null-termination check
[lttng-tools.git]
/
tests
/
stress
/
test_multi_sessions_per_uid_5app_streaming
diff --git
a/tests/stress/test_multi_sessions_per_uid_5app_streaming
b/tests/stress/test_multi_sessions_per_uid_5app_streaming
index 36a15d92e8a545011e202aedbb944f03239603d7..a0f1898b68e82fc44f2942e9ed060ae3fac65203 100755
(executable)
--- a/
tests/stress/test_multi_sessions_per_uid_5app_streaming
+++ b/
tests/stress/test_multi_sessions_per_uid_5app_streaming
@@
-1,14
+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/..
@@
-40,18
+35,9
@@
function enable_channel_per_uid()
ok $? "Enable channel $channel_name per UID for session $sess_name"
}
ok $? "Enable channel $channel_name per UID for session $sess_name"
}
-function lttng_create_session_uri
-{
- local name=$1
-
- # Create session with default path
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $name -U net://localhost >/dev/null 2>&1
- ok $? "Create session on net://localhost"
-}
-
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!!!"
@@
-65,7
+51,7
@@
function check_sessiond()
function check_relayd()
{
function check_relayd()
{
- if [ -z "$(
pidof
lt-lttng-relayd)" ]; then
+ if [ -z "$(
lttng_pgrep
lt-lttng-relayd)" ]; then
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The relay daemon died unexpectedly!!!"
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The relay daemon died unexpectedly!!!"
@@
-79,15
+65,13
@@
function check_relayd()
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.
$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_SESSIOND 2>&1
# 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 --background --consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE_SESSIOND 2>&1
@@
-99,9
+83,8
@@
function start_sessiond()
function start_relayd
{
local opt=$1
function start_relayd
{
local opt=$1
- local RELAYD_BIN="lttng-relayd"
- if [ -z $(
pidof
lt-$RELAYD_BIN) ]; then
+ if [ -z $(
lttng_pgrep
lt-$RELAYD_BIN) ]; then
$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
ok $? "Start lttng-relayd (opt: \"$opt\")"
fi
$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
ok $? "Start lttng-relayd (opt: \"$opt\")"
fi
@@
-111,25
+94,25
@@
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
- lttng_create_session_uri $SESSION_NAME-$a
+ create_lttng_session_uri $SESSION_NAME-$a net://localhost
check_sessiond
check_relayd
enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
check_sessiond
check_relayd
check_sessiond
check_relayd
enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
check_sessiond
check_relayd
- enable_ust_lttng_event $SESSION_NAME-$a $EVENT_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME-$a $EVENT_NAME
check_sessiond
check_relayd
check_sessiond
check_relayd
- start_lttng_tracing $SESSION_NAME-$a
+ start_lttng_tracing
_ok
$SESSION_NAME-$a
check_sessiond
check_relayd
done
for a in $(seq 1 $NR_SESSION); do
check_sessiond
check_relayd
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_relayd
check_sessiond
check_relayd
- destroy_lttng_session $SESSION_NAME-$a
+ destroy_lttng_session
_ok
$SESSION_NAME-$a
check_sessiond
check_relayd
done
check_sessiond
check_relayd
done
@@
-154,11
+137,10
@@
function sighandler()
{
cleanup
rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
{
cleanup
rm $LOG_FILE_SESSIOND $LOG_FILE_RELAYD
- exit 1
+ full_cleanup
}
}
-trap sighandler SIGINT
-trap sighandler SIGTERM
+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
This page took
0.028094 seconds
and
4
git commands to generate.