DIR=$(readlink -f $TESTDIR)
if [ -z $(pidof lt-$RELAYD_BIN) ]; then
- $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1 &
+ $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt >/dev/null 2>&1
#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
if [ $? -eq 1 ]; then
fail "Start lttng-relayd (opt: $opt)"
fi
}
-function stop_lttng_relayd
+function stop_lttng_relayd_nocheck
{
PID_RELAYD=`pidof lt-$RELAYD_BIN`
+ diag "Killing lttng-relayd (pid: $PID_RELAYD)"
kill $PID_RELAYD >/dev/null 2>&1
+ retval=$?
- if [ $? -eq 1 ]; then
- fail "Kill lttng-relayd (pid: $PID_RELAYD)"
- return 1
- else
+ if [ $retval -eq 1 ]; then
out=1
while [ -n "$out" ]; do
out=$(pidof lt-$RELAYD_BIN)
sleep 0.5
done
- pass "Kill lttng-relayd (pid: $PID_RELAYD)"
+ fi
+ return $retval
+}
+
+function stop_lttng_relayd
+{
+ stop_lttng_relayd_nocheck
+
+ if [ $? -eq 1 ]; then
+ fail "Killed lttng-relayd (pid: $PID_RELAYD)"
+ return 1
+ else
+ pass "Killed lttng-relayd (pid: $PID_RELAYD)"
return 0
fi
}
ok $? "Enable JUL event $event_name for session $sess_name"
}
+function enable_jul_lttng_event_loglevel()
+{
+ sess_name=$1
+ event_name="$2"
+ loglevel=$3
+ channel_name=$4
+
+ if [ -z $channel_name ]; then
+ # default channel if none specified
+ chan=""
+ else
+ chan="-c $channel_name"
+ fi
+
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j >/dev/null 2>&1
+ ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
+}
+
function enable_ust_lttng_event_filter()
{
sess_name="$1"
ok $? "Snapshot recorded"
}
+function lttng_save()
+{
+ local sess_name=$1
+ local opts=$2
+
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts >/dev/null 2>&1
+ ok $? "Session successfully saved"
+}
+
+function lttng_load()
+{
+ local opts=$1
+
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts >/dev/null 2>&1
+ ok $? "Load command successful"
+}
+
function trace_matches ()
{
event_name=$1