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()
{
- if [ -z "$(pidof lt-lttng-sessiond)" ]; then
+ if [ -z "$(pgrep --full lt-lttng-sessiond)" ]; then
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The session daemon died unexpectedly!!!"
function check_relayd()
{
- if [ -z "$(pidof lt-lttng-relayd)" ]; then
+ if [ -z "$(pgrep --full lt-lttng-relayd)" ]; then
local str_date=$(date +%H%M%S-%d%m%Y)
diag "!!!The relay daemon died unexpectedly!!!"
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
- if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+ if [ -z $(pgrep --full 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
function start_relayd
{
local opt=$1
- local RELAYD_BIN="lttng-relayd"
- if [ -z $(pidof lt-$RELAYD_BIN) ]; then
+ if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
ok $? "Start lttng-relayd (opt: \"$opt\")"
fi
{
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
stop_lttng_tracing_ok $SESSION_NAME-$a
check_sessiond
check_relayd
- destroy_lttng_session $SESSION_NAME-$a
+ destroy_lttng_session_ok $SESSION_NAME-$a
check_sessiond
check_relayd
done
{
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