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!!!"
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
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
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
- 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
- stop_lttng_tracing $SESSION_NAME-$a
+ 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