X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=21212bc8a010505a17528e45dde7a3584cc2c8ab;hp=6d72a068f2212a6417897269aec505b98f053e42;hb=312dabc3ec56987e3c92ecf7cdfb037abe1ec4fb;hpb=29655db78c6d522b6322765cff1c2812df4d8ee8

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 6d72a068f..21212bc8a 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -16,9 +16,11 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 SESSIOND_BIN="lttng-sessiond"
+CONSUMERD_BIN="lttng-consumerd"
 RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
+OUTPUT_DEST=/dev/null 2>&1
 
 # Minimal kernel version supported for session daemon tests
 KERNEL_MAJOR_VERSION=2
@@ -82,13 +84,21 @@ function lttng_enable_kernel_event
 {
 	sess_name=$1
 	event_name=$2
+	channel_name=$3
 
 	if [ -z $event_name ]; then
 		# Enable all event if no event name specified
 		event_name="-a"
 	fi
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -k >/dev/null 2>&1
+	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 "$event_name" $chan -s $sess_name -k >$OUTPUT_DEST
 	ok $? "Enable kernel event $event_name for session $sess_name"
 }
 
@@ -99,7 +109,7 @@ function start_lttng_relayd
 	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 >$OUTPUT_DEST
 		#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
 		if [ $? -eq 1 ]; then
 			fail "Start lttng-relayd (opt: $opt)"
@@ -112,22 +122,33 @@ function start_lttng_relayd
 	fi
 }
 
-function stop_lttng_relayd
+function stop_lttng_relayd_nocheck
 {
 	PID_RELAYD=`pidof lt-$RELAYD_BIN`
 
-	kill $PID_RELAYD >/dev/null 2>&1
+	diag "Killing lttng-relayd (pid: $PID_RELAYD)"
+	kill $PID_RELAYD >$OUTPUT_DEST
+	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
 }
@@ -146,13 +167,13 @@ function start_lttng_sessiond()
 	fi
 
 	DIR=$(readlink -f $TESTDIR)
+	: ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
+	export LTTNG_SESSION_CONFIG_XSD_PATH
 
 	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
-		$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+		$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
 		#$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1 &
 		status=$?
-		# Wait for sessiond to bootstrap
-		sleep 2
 		ok $status "Start session daemon"
 	fi
 }
@@ -166,7 +187,7 @@ function stop_lttng_sessiond ()
 
 	PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
 
-	kill $PID_SESSIOND >/dev/null 2>&1
+	kill $PID_SESSIOND >$OUTPUT_DEST
 
 	if [ $? -eq 1 ]; then
 		fail "Kill sessions daemon"
@@ -177,26 +198,66 @@ function stop_lttng_sessiond ()
 			out=$(pidof lt-$SESSIOND_BIN)
 			sleep 0.5
 		done
+		out=1
+		while [ -n "$out" ]; do
+			out=$(pidof $CONSUMERD_BIN)
+			sleep 0.5
+		done
 		pass "Kill session daemon"
 	fi
 }
 
+function list_lttng_with_opts ()
+{
+	opts=$1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts >$OUTPUT_DEST
+	ok $? "Lttng-tool list command with option $opts"
+}
+
+function create_lttng_session_no_output ()
+{
+	sess_name=$1
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >$OUTPUT_DEST
+	ok $? "Create session $sess_name in no-output mode"
+}
+
 function create_lttng_session ()
 {
 	sess_name=$1
 	trace_path=$2
+	expected_to_fail=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
-	ok $? "Create session $sess_name in $trace_path"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path > $OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail ]]; then
+		if [[ $ret ]]; then
+			pass "Expected fail on session creation $sess_name in $trace_path"
+		else
+			fail "Session $sess_name creation in $trace_path was expected to fail"
+		fi
+	else
+		ok $ret "Create session $sess_name in $trace_path"
+	fi
 }
 
 function enable_ust_lttng_channel()
 {
 	sess_name=$1
 	channel_name=$2
+	expect_fail=$3
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >/dev/null 2>&1
-	ok $? "Enable channel $channel_name for session $sess_name"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
+	ret=$?
+	if [[ $expect_fail ]]; then
+		if [[ $ret ]]; then
+			pass "Enable channel $channel_name for session $sess_name expected fail"
+		else
+			fail "Enable channel $channel_name for session $sess_name did not fail as expected"
+		fi
+	else
+		ok $ret "Enable channel $channel_name for session $sess_name"
+	fi
 }
 
 function disable_ust_lttng_channel()
@@ -204,26 +265,87 @@ function disable_ust_lttng_channel()
 	sess_name=$1
 	channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
 	ok $? "Disable channel $channel_name for session $sess_name"
 }
 
+function enable_lttng_mmap_overwrite_kernel_channel()
+{
+	sess_name=$1
+	channel_name=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite >$OUTPUT_DEST
+	ok $? "Enable channel $channel_name for session $sess_name"
+}
+
+function enable_lttng_mmap_overwrite_ust_channel()
+{
+	sess_name=$1
+	channel_name=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >$OUTPUT_DEST
+	ok $? "Enable channel $channel_name for session $sess_name"
+}
+
 function enable_ust_lttng_event ()
 {
 	sess_name=$1
 	event_name="$2"
+	channel_name=$3
+
+	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 "$event_name" -s $sess_name -u >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
 	ok $? "Enable event $event_name for session $sess_name"
 }
 
+function enable_jul_lttng_event()
+{
+	sess_name=$1
+	event_name="$2"
+	channel_name=$3
+
+	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 "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
+	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 >$OUTPUT_DEST
+	ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
+}
+
 function enable_ust_lttng_event_filter()
 {
 	sess_name="$1"
 	event_name="$2"
 	filter="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >$OUTPUT_DEST
 	ok $? "Enable event $event_name with filtering for session $sess_name"
 }
 
@@ -233,7 +355,7 @@ function enable_ust_lttng_event_loglevel()
 	event_name="$2"
 	loglevel="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >$OUTPUT_DEST
 	ok $? "Enable event $event_name with loglevel $loglevel"
 }
 
@@ -243,7 +365,7 @@ function enable_ust_lttng_event_loglevel_only()
 	event_name="$2"
 	loglevel="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >$OUTPUT_DEST
 	ok $? "Enable event $event_name with loglevel-only $loglevel"
 }
 
@@ -252,15 +374,24 @@ function disable_ust_lttng_event ()
 	sess_name="$1"
 	event_name="$2"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -u >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -u >$OUTPUT_DEST
 	ok $? "Disable event $event_name for session $sess_name"
 }
 
+function disable_jul_lttng_event ()
+{
+	local sess_name="$1"
+	local event_name="$2"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -j >/dev/null 2>&1
+	ok $? "Disable JUL event $event_name for session $sess_name"
+}
+
 function start_lttng_tracing ()
 {
 	sess_name=$1
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
 	ok $? "Start tracing for session $sess_name"
 }
 
@@ -268,7 +399,7 @@ function stop_lttng_tracing ()
 {
 	sess_name=$1
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
 	ok $? "Stop lttng tracing for session $sess_name"
 }
 
@@ -276,11 +407,60 @@ function destroy_lttng_session ()
 {
 	sess_name=$1
 
-
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
 	ok $? "Destroy lttng session $sess_name"
 }
 
+function destroy_lttng_sessions ()
+{
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
+	ok $? "Destroy all lttng sessions"
+}
+
+function lttng_snapshot_add_output ()
+{
+	sess_name=$1
+	trace_path=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >$OUTPUT_DEST
+	ok $? "Added snapshot output file://$trace_path"
+}
+
+function lttng_snapshot_del_output ()
+{
+	local sess_name=$1
+	local id=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >$OUTPUT_DEST
+	ok $? "Deleted snapshot output id $id"
+}
+
+function lttng_snapshot_record ()
+{
+	sess_name=$1
+	trace_path=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name >$OUTPUT_DEST
+	ok $? "Snapshot recorded"
+}
+
+function lttng_save()
+{
+	local sess_name=$1
+	local opts=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts >$OUTPUT_DEST
+	ok $? "Session successfully saved"
+}
+
+function lttng_load()
+{
+	local opts=$1
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts >$OUTPUT_DEST
+	ok $? "Load command successful"
+}
+
 function trace_matches ()
 {
 	event_name=$1
@@ -310,11 +490,18 @@ function validate_trace
 	    skip 0 "Babeltrace binary not found. Skipping trace validation"
 	fi
 
-	traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $event_name | wc -l)
-	if [ "$traced" -ne 0 ]; then
-	    pass "Validate trace for event $event_name"
-	else
-	    fail "Validate trace for event $event_name"
-	    diag "Found $traced occurences of $event_name"
-	fi
+	OLDIFS=$IFS
+	IFS=","
+	for i in $event_name; do
+		traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $i | wc -l)
+		if [ "$traced" -ne 0 ]; then
+			pass "Validate trace for event $i, $traced events"
+		else
+			fail "Validate trace for event $i"
+			diag "Found $traced occurences of $i"
+		fi
+	done
+	ret=$?
+	IFS=$OLDIFS
+	return $ret
 }