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

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 6d72a068f..968a6e613 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -82,13 +82,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 >/dev/null 2>&1
 	ok $? "Enable kernel event $event_name for session $sess_name"
 }
 
@@ -148,11 +156,9 @@ function start_lttng_sessiond()
 	DIR=$(readlink -f $TESTDIR)
 
 	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 --daemonize --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
 }
@@ -181,6 +187,14 @@ function stop_lttng_sessiond ()
 	fi
 }
 
+function create_lttng_session_no_output ()
+{
+	sess_name=$1
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >/dev/null 2>&1
+	ok $? "Create session $sess_name in no-output mode"
+}
+
 function create_lttng_session ()
 {
 	sess_name=$1
@@ -208,15 +222,58 @@ function disable_ust_lttng_channel()
 	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 >/dev/null 2>&1
+	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 >/dev/null 2>&1
+	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 >/dev/null 2>&1
 	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 >/dev/null 2>&1
+	ok $? "Enable JUL event $event_name for session $sess_name"
+}
+
 function enable_ust_lttng_event_filter()
 {
 	sess_name="$1"
@@ -281,6 +338,33 @@ function destroy_lttng_session ()
 	ok $? "Destroy lttng session $sess_name"
 }
 
+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 >/dev/null 2>&1
+	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 >/dev/null 2>&1
+	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 >/dev/null 2>&1
+	ok $? "Snapshot recorded"
+}
+
 function trace_matches ()
 {
 	event_name=$1
@@ -310,11 +394,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
 }