X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=454627eaae3ad6115b598f3067d1f81410899631;hp=fe552830cf5d89b9e73e29e13f6e2e96b0d5a04c;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hpb=d53addeb964039ae2f544de1d7d452fb5ad6da69

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index fe552830c..454627eaa 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -27,6 +27,11 @@ KERNEL_MAJOR_VERSION=2
 KERNEL_MINOR_VERSION=6
 KERNEL_PATCHLEVEL_VERSION=27
 
+# We set the default UST register timeout to "wait forever", so that
+# basic tests don't have to worry about hitting timeouts on busy
+# systems. Specialized tests should test those corner-cases.
+export LTTNG_UST_REGISTER_TIMEOUT=-1
+
 source $TESTDIR/utils/tap/tap.sh
 
 function print_ok ()
@@ -102,6 +107,137 @@ function lttng_enable_kernel_event
 	ok $? "Enable kernel event $event_name for session $sess_name"
 }
 
+function lttng_enable_kernel_syscall()
+{
+	local expected_to_fail=$1
+	local sess_name=$2
+	local syscall_name=$3
+	local channel_name=$4
+
+	if [ -z $syscall_name ]; then
+		# Enable all event if no syscall name specified
+		syscall_name="-a"
+	fi
+
+	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 --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail -eq "1" ]]; then
+		test $ret -ne "0"
+		ok $? "Enable kernel syscall $syscall_name for session $sess_name on channel $channel_name fail as expected"
+	else
+		ok $ret "Enable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
+	fi
+}
+
+function lttng_enable_kernel_syscall_ok()
+{
+	lttng_enable_kernel_syscall 0 ${*}
+}
+
+function lttng_enable_kernel_syscall_fail()
+{
+	lttng_enable_kernel_syscall 1 ${*}
+}
+
+function lttng_disable_kernel_syscall()
+{
+	local expected_to_fail=$1
+	local sess_name=$2
+	local syscall_name=$3
+	local channel_name=$4
+
+	if [ -z $syscall_name ]; then
+		# Enable all event if no syscall name specified
+		syscall_name="-a"
+	fi
+
+	if [ -z $channel_name ]; then
+		# default channel if none specified
+		chan=""
+	else
+		chan="-c $channel_name"
+	fi
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
+
+	ret=$?
+	if [[ $expected_to_fail -eq "1" ]]; then
+		test $ret -ne "0"
+		ok $? "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name fail as expected"
+	else
+		ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
+	fi
+}
+
+function lttng_disable_kernel_syscall_ok()
+{
+	lttng_disable_kernel_syscall 0 ${*}
+}
+
+function lttng_disable_kernel_syscall_fail()
+{
+	lttng_disable_kernel_syscall 1 ${*}
+}
+
+function lttng_enable_kernel_channel()
+{
+	local expected_to_fail=$1
+	local sess_name=$2
+	local channel_name=$3
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail -eq "1" ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected failure on kernel channel creation $channel_name in $sess_name"
+	else
+		ok $ret "Enable channel $channel_name for session $sess_name"
+	fi
+}
+
+function lttng_enable_kernel_channel_ok()
+{
+	lttng_enable_kernel_channel 0 ${*}
+}
+
+function lttng_enable_kernel_channel_fail()
+{
+	lttng_enable_kernel_channel 1 ${*}
+}
+
+function lttng_disable_kernel_channel()
+{
+	local expected_to_fail=$1
+	local sess_name=$2
+	local channel_name=$3
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail -eq "1" ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected failure on kernel channel creation $channel_name in $sess_name"
+	else
+		ok $ret "disable channel $channel_name for session $sess_name"
+	fi
+}
+
+function lttng_disable_kernel_channel_ok()
+{
+	lttng_disable_kernel_channel 0 ${*}
+}
+
+function lttng_disable_kernel_channel_fail()
+{
+	lttng_disable_kernel_channel 1 ${*}
+}
+
 function start_lttng_relayd
 {
 	local opt=$1
@@ -180,7 +316,7 @@ function start_lttng_sessiond()
 		else
 			$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"
 		fi
-		#$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 &
+		#$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" --verbose-consumer >>/tmp/sessiond.log 2>&1
 		status=$?
 		ok $status "Start session daemon"
 	fi
@@ -232,13 +368,13 @@ function create_lttng_session_no_output ()
 
 function create_lttng_session ()
 {
-	local sess_name=$1
-	local trace_path=$2
-	local expected_to_fail=$3
+	local expected_to_fail=$1
+	local sess_name=$2
+	local trace_path=$3
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path > $OUTPUT_DEST
 	ret=$?
-	if [[ $expected_to_fail ]]; then
+	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
 		ok $? "Expected fail on session creation $sess_name in $trace_path"
 	else
@@ -246,15 +382,26 @@ function create_lttng_session ()
 	fi
 }
 
-function enable_ust_lttng_channel()
+function create_lttng_session_ok ()
 {
-	local sess_name=$1
-	local channel_name=$2
-	local expect_fail=$3
+	create_lttng_session 0 "$@"
+}
+
+function create_lttng_session_fail ()
+{
+	create_lttng_session 1 "$@"
+}
+
+
+function enable_ust_lttng_channel ()
+{
+	local expect_fail=$1
+	local sess_name=$2
+	local channel_name=$3
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
 	ret=$?
-	if [[ $expect_fail ]]; then
+	if [[ $expect_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
 		ok $? "Expected fail on ust channel creation $channel_name in $sess_name"
 	else
@@ -262,6 +409,16 @@ function enable_ust_lttng_channel()
 	fi
 }
 
+function enable_ust_lttng_channel_ok ()
+{
+	enable_ust_lttng_channel 0 "$@"
+}
+
+function enable_ust_lttng_channel_fail ()
+{
+	enable_ust_lttng_channel 1 "$@"
+}
+
 function disable_ust_lttng_channel()
 {
 	local sess_name=$1
@@ -291,10 +448,10 @@ function enable_lttng_mmap_overwrite_ust_channel()
 
 function enable_ust_lttng_event ()
 {
-	local sess_name=$1
-	local event_name="$2"
-	local channel_name=$3
-	local expected_to_fail=$4
+	local expected_to_fail=$1
+	local sess_name=$2
+	local event_name="$3"
+	local channel_name=$4
 
 	if [ -z $channel_name ]; then
 		# default channel if none specified
@@ -305,7 +462,7 @@ function enable_ust_lttng_event ()
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
 	ret=$?
-	if [[ $expected_to_fail ]]; then
+	if [[ $expected_to_fail -eq "1" ]]; then
 		test $ret -ne "0"
 		ok $? "Enable ust event $event_name for session $session_name on channel $channel_name failed as expected"
 	else
@@ -313,6 +470,16 @@ function enable_ust_lttng_event ()
 	fi
 }
 
+function enable_ust_lttng_event_ok ()
+{
+	enable_ust_lttng_event 0 "$@"
+}
+
+function enable_ust_lttng_event_fail ()
+{
+	enable_ust_lttng_event 1 "$@"
+}
+
 function enable_jul_lttng_event()
 {
 	sess_name=$1
@@ -348,6 +515,76 @@ function enable_jul_lttng_event_loglevel()
 	ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
 }
 
+function enable_log4j_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 -l >$OUTPUT_DEST
+	ok $? "Enable LOG4J event $event_name for session $sess_name"
+}
+
+function enable_log4j_lttng_event_loglevel()
+{
+	local sess_name=$1
+	local event_name="$2"
+	local loglevel=$3
+	local 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 -l >$OUTPUT_DEST
+	ok $? "Enable LOG4J event $event_name for session $sess_name with loglevel $loglevel"
+}
+
+function enable_python_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 -p >$OUTPUT_DEST
+	ok $? "Enable Python event $event_name for session $sess_name"
+}
+
+function enable_python_lttng_event_loglevel()
+{
+	local sess_name=$1
+	local event_name="$2"
+	local loglevel=$3
+	local 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 -p >$OUTPUT_DEST
+	ok $? "Enable Python event $event_name for session $sess_name with loglevel $loglevel"
+}
+
 function enable_ust_lttng_event_filter()
 {
 	local sess_name="$1"
@@ -404,14 +641,32 @@ function disable_jul_lttng_event ()
 	ok $? "Disable JUL event $event_name for session $sess_name"
 }
 
+function disable_log4j_lttng_event ()
+{
+	local sess_name="$1"
+	local event_name="$2"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -l >/dev/null 2>&1
+	ok $? "Disable LOG4J event $event_name for session $sess_name"
+}
+
+function disable_python_lttng_event ()
+{
+	local sess_name="$1"
+	local event_name="$2"
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -p >$OUTPUT_DEST
+	ok $? "Disable Python event $event_name for session $sess_name"
+}
+
 function start_lttng_tracing ()
 {
-	local sess_name=$1
-	local expected_to_fail=$2
+	local expected_to_fail=$1
+	local sess_name=$2
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
 	ret=$?
-	if [[ $expected_to_fail ]]; then
+	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
 		ok $? "Expected fail on start tracing for session: $sess_name"
 	else
@@ -419,14 +674,24 @@ function start_lttng_tracing ()
 	fi
 }
 
+function start_lttng_tracing_ok ()
+{
+	start_lttng_tracing 0 "$@"
+}
+
+function start_lttng_tracing_fail ()
+{
+	start_lttng_tracing 1 "$@"
+}
+
 function stop_lttng_tracing ()
 {
-	local sess_name=$1
-	local expected_to_fail=$2
+	local expected_to_fail=$1
+	local sess_name=$2
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
 	ret=$?
-	if [[ $expected_to_fail ]]; then
+	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
 		ok $? "Expected fail on stop tracing for session: $sess_name"
 	else
@@ -434,14 +699,24 @@ function stop_lttng_tracing ()
 	fi
 }
 
+function stop_lttng_tracing_ok ()
+{
+	stop_lttng_tracing 0 "$@"
+}
+
+function stop_lttng_tracing_fail ()
+{
+	stop_lttng_tracing 1 "$@"
+}
+
 function destroy_lttng_session ()
 {
-	local sess_name=$1
-	local expected_to_fail=$2
+	local expected_to_fail=$1
+	local sess_name=$2
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
 	ret=$?
-	if [[ $expected_to_fail ]]; then
+	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
 		ok $? "Expected fail on session deletion $sess_name"
 	else
@@ -449,6 +724,18 @@ function destroy_lttng_session ()
 	fi
 }
 
+function destroy_lttng_session_ok ()
+{
+	destroy_lttng_session 0 "$@"
+
+}
+
+function destroy_lttng_session_fail ()
+{
+	destroy_lttng_session 1 "$@"
+}
+
+
 function destroy_lttng_sessions ()
 {
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
@@ -584,3 +871,63 @@ function validate_trace
 	IFS=$OLDIFS
 	return $ret
 }
+
+function validate_trace_exp()
+{
+	local event_exp=$1
+	local trace_path=$2
+
+	which $BABELTRACE_BIN >/dev/null
+	skip $? -ne 0 "Babeltrace binary not found. Skipping trace validation"
+
+	traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep ${event_exp} | wc -l)
+	if [ "$traced" -ne 0 ]; then
+		pass "Validate trace for expression '${event_exp}', $traced events"
+	else
+		fail "Validate trace for expression '${event_exp}'"
+		diag "Found $traced occurences of '${event_exp}'"
+	fi
+	ret=$?
+	return $ret
+}
+
+function validate_trace_only_exp()
+{
+	local event_exp=$1
+	local trace_path=$2
+
+	which $BABELTRACE_BIN >/dev/null
+	skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+
+	local count=$($BABELTRACE_BIN $trace_path | grep ${event_exp} | wc -l)
+	local total=$($BABELTRACE_BIN $trace_path | wc -l)
+
+	if [ "$count" -ne 0 ] && [ "$total" -eq "$count" ]; then
+		pass "Trace match with $total for expression '${event_exp}"
+	else
+		fail "Trace match"
+		diag "$total syscall event(s) found, only syscalls matching expression '${event_exp}' ($count occurrences) are expected"
+	fi
+	ret=$?
+	return $ret
+}
+
+function validate_trace_empty()
+{
+	local trace_path=$1
+
+	which $BABELTRACE_BIN >/dev/null
+	if [ $? -ne 0 ]; then
+	    skip 0 "Babeltrace binary not found. Skipping trace validation"
+	fi
+
+	traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | wc -l)
+	if [ "$traced" -eq 0 ]; then
+		pass "Validate empty trace"
+	else
+		fail "Validate empty trace"
+		diag "Found $traced events in trace"
+	fi
+	ret=$?
+	return $ret
+}