X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=4ee3dda8720428c9ab36c65ba9065d0bd25b8d66;hp=7ed0ebc734f561d80953380564b311fac768d0af;hb=fd7fe1a8c1960a83f49d1376cd69cf5972dcff3b;hpb=2cf4830036ca5f4ac5258797e746134decf3abe9 diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 7ed0ebc73..4ee3dda87 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -33,6 +33,12 @@ KERNEL_PATCHLEVEL_VERSION=27 # systems. Specialized tests should test those corner-cases. export LTTNG_UST_REGISTER_TIMEOUT=-1 +# We set the default lttng-sessiond path to /bin/true to prevent the spawning +# of a daemonized sessiond. This is necessary since 'lttng create' will spawn +# its own sessiond if none is running. It also ensures that 'lttng create' +# fails when no sessiond is running. +export LTTNG_SESSIOND_PATH="/bin/true" + source $TESTDIR/utils/tap/tap.sh function print_ok () @@ -86,18 +92,29 @@ function randstring() echo } -function lttng_enable_kernel_event +# Return the number of _configured_ CPUs. +function conf_proc_count() { - local sess_name=$1 - local event_name=$2 - local channel_name=$3 + getconf _NPROCESSORS_CONF + if [ $? -ne 0 ]; then + diag "Failed to get the number of configured CPUs" + fi + echo +} - if [ -z $event_name ]; then +function enable_kernel_lttng_event +{ + local expected_to_fail="$1" + local sess_name="$2" + local event_name="$3" + local channel_name="$4" + + if [ -z "$event_name" ]; then # Enable all event if no event name specified event_name="-a" fi - if [ -z $channel_name ]; then + if [ -z "$channel_name" ]; then # default channel if none specified chan="" else @@ -105,7 +122,29 @@ function lttng_enable_kernel_event fi $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST - ok $? "Enable kernel event $event_name for session $sess_name" + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test $ret -ne "0" + ok $? "Enable kernel event $event_name for session $session_name on channel $channel_name failed as expected" + else + ok $ret "Enable kernel event $event_name for session $sess_name" + fi +} + +function enable_kernel_lttng_event_ok () +{ + enable_kernel_lttng_event 0 "$@" +} + +function enable_kernel_lttng_event_fail () +{ + enable_kernel_lttng_event 1 "$@" +} + +# Old interface +function lttng_enable_kernel_event +{ + enable_kernel_lttng_event_ok "$@" } function lttng_enable_kernel_syscall() @@ -171,7 +210,7 @@ function lttng_disable_kernel_syscall() 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" + ok $? "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name failed as expected" else ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name" fi @@ -197,7 +236,7 @@ function lttng_enable_kernel_channel() ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected failure on kernel channel creation $channel_name in $sess_name" + ok $? "Enable channel $channel_name for session $sess_name failed as expected" else ok $ret "Enable channel $channel_name for session $sess_name" fi @@ -223,9 +262,9 @@ function lttng_disable_kernel_channel() ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected failure on kernel channel creation $channel_name in $sess_name" + ok $? "Disable channel $channel_name for session $sess_name failed as expected" else - ok $ret "disable channel $channel_name for session $sess_name" + ok $ret "Disable channel $channel_name for session $sess_name" fi } @@ -239,62 +278,88 @@ function lttng_disable_kernel_channel_fail() lttng_disable_kernel_channel 1 "$@" } -function start_lttng_relayd +function start_lttng_relayd_opt() { - local opt=$1 + local withtap=$1 + local opt=$2 DIR=$(readlink -f $TESTDIR) - if [ -z $(pidof lt-$RELAYD_BIN) ]; then + if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_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)" + if [ $withtap -eq "1" ]; then + fail "Start lttng-relayd (opt: $opt)" + fi return 1 else - pass "Start lttng-relayd (opt: $opt)" + if [ $withtap -eq "1" ]; then + pass "Start lttng-relayd (opt: $opt)" + fi fi else pass "Start lttng-relayd (opt: $opt)" fi } -function stop_lttng_relayd_nocheck +function start_lttng_relayd() { - PID_RELAYD=`pidof lt-$RELAYD_BIN` + start_lttng_relayd_opt 1 "$@" +} - diag "Killing lttng-relayd (pid: $PID_RELAYD)" +function start_lttng_relayd_notap() +{ + start_lttng_relayd_opt 0 "$@" +} + +function stop_lttng_relayd_opt() +{ + local withtap=$1 + + PID_RELAYD=`pgrep --full lt-$RELAYD_BIN` + + if [ $withtap -eq "1" ]; then + diag "Killing lttng-relayd (pid: $PID_RELAYD)" + fi kill $PID_RELAYD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST retval=$? - if [ $retval -eq 1 ]; then + if [ $? -eq 1 ]; then + if [ $withtap -eq "1" ]; then + fail "Kill relay daemon" + fi + return 1 + else out=1 while [ -n "$out" ]; do - out=$(pidof lt-$RELAYD_BIN) + out=$(pgrep --full lt-$RELAYD_BIN) sleep 0.5 done + if [ $withtap -eq "1" ]; then + pass "Kill relay daemon" + fi fi return $retval } -function stop_lttng_relayd +function stop_lttng_relayd() { - stop_lttng_relayd_nocheck + stop_lttng_relayd_opt 1 "$@" +} - if [ $? -eq 1 ]; then - fail "Killed lttng-relayd (pid: $PID_RELAYD)" - return 1 - else - pass "Killed lttng-relayd (pid: $PID_RELAYD)" - return 0 - fi +function stop_lttng_relayd_notap() +{ + stop_lttng_relayd_opt 0 "$@" } -#First argument: load path for automatic loading -function start_lttng_sessiond() +#First arg: show tap output +#Second argument: load path for automatic loading +function start_lttng_sessiond_opt() { + local withtap=$1 + local load_path=$2 - local load_path="$1" if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then # Env variable requested no session daemon return @@ -310,46 +375,136 @@ function start_lttng_sessiond() : ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/} export LTTNG_SESSION_CONFIG_XSD_PATH - if [ -z $(pidof lt-$SESSIOND_BIN) ]; then + if [ -z $(pgrep --full lt-$SESSIOND_BIN) ]; then # Have a load path ? - if [ -n "$1" ]; then - $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$1" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" + if [ -n "$load_path" ]; then + $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" 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 --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" + if [ $withtap -eq "1" ]; then + ok $status "Start session daemon" + fi fi } -function stop_lttng_sessiond () +function start_lttng_sessiond() +{ + start_lttng_sessiond_opt 1 "$@" +} + +function start_lttng_sessiond_notap() +{ + start_lttng_sessiond_opt 0 "$@" +} + +function stop_lttng_sessiond_opt() { + local withtap=$1 + local signal=$2 + local kill_opt="" + if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then # Env variable requested no session daemon return fi - PID_SESSIOND=`pidof lt-$SESSIOND_BIN` + PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN` + + if [ -n "$2" ]; then + kill_opt="$kill_opt -s $signal" + fi - kill $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + kill $kill_opt $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST if [ $? -eq 1 ]; then - fail "Kill sessions daemon" - return 1 + if [ $withtap -eq "1" ]; then + fail "Kill sessions daemon" + fi else out=1 while [ -n "$out" ]; do - out=$(pidof lt-$SESSIOND_BIN) + out=$(pgrep --full lt-$SESSIOND_BIN) sleep 0.5 done out=1 while [ -n "$out" ]; do - out=$(pidof $CONSUMERD_BIN) + out=$(pgrep --full $CONSUMERD_BIN) sleep 0.5 done - pass "Kill session daemon" + if [ $withtap -eq "1" ]; then + pass "Kill session daemon" + fi + fi +} + +function stop_lttng_sessiond() +{ + stop_lttng_sessiond_opt 1 "$@" +} + +function stop_lttng_sessiond_notap() +{ + stop_lttng_sessiond_opt 0 "$@" +} + +function stop_lttng_consumerd_opt() +{ + local withtap=$1 + local signal=$2 + local kill_opt="" + + PID_CONSUMERD=`pgrep --full $CONSUMERD_BIN` + + if [ -n "$2" ]; then + kill_opt="$kill_opt -s $signal" fi + + if [ $withtap -eq "1" ]; then + diag "Killing lttng-consumerd (pid: $PID_CONSUMERD)" + fi + kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + retval=$? + set +x + + if [ $? -eq 1 ]; then + if [ $withtap -eq "1" ]; then + fail "Kill consumer daemon" + fi + return 1 + else + out=1 + while [ $out -ne 0 ]; do + pid=$(pgrep --full $CONSUMERD_BIN) + + # If consumerds are still present check their status. + # A zombie status qualifies the consumerd as *killed* + out=0 + for consumer_pid in $pid; do + state=$(ps -p $consumer_pid -o state= ) + if [[ -n "$state" && "$state" != "Z" ]]; then + out=1 + fi + done + sleep 0.5 + done + if [ $withtap -eq "1" ]; then + pass "Kill consumer daemon" + fi + fi + return $retval +} + +function stop_lttng_consumerd() +{ + stop_lttng_consumerd_opt 1 "$@" +} + +function stop_lttng_consumerd_notap() +{ + stop_lttng_consumerd_opt 0 "$@" } function list_lttng_with_opts () @@ -372,12 +527,13 @@ function create_lttng_session () local expected_to_fail=$1 local sess_name=$2 local trace_path=$3 + local opt=$4 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path > $OUTPUT_DEST + $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path $opt > $OUTPUT_DEST ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on session creation $sess_name in $trace_path" + ok $? "Create session $sess_name in $trace_path failed as expected" else ok $ret "Create session $sess_name in $trace_path" fi @@ -396,15 +552,16 @@ function create_lttng_session_fail () function enable_ust_lttng_channel () { - local expect_fail=$1 + local expected_to_fail=$1 local sess_name=$2 local channel_name=$3 + local opt=$4 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST ret=$? - if [[ $expect_fail -eq "1" ]]; then + if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on ust channel creation $channel_name in $sess_name" + ok $? "Enable channel $channel_name for session $sess_name failed as expected" else ok $ret "Enable channel $channel_name for session $sess_name" fi @@ -465,9 +622,9 @@ function enable_ust_lttng_event () ret=$? 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" + ok $? "Enable ust event $event_name for session $session_name failed as expected" else - ok $ret "Enable event $event_name for session $sess_name" + ok $ret "Enable ust event $event_name for session $sess_name" fi } @@ -669,7 +826,7 @@ function start_lttng_tracing () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on start tracing for session: $sess_name" + ok $? "Start tracing for session $sess_name failed as expected" else ok $ret "Start tracing for session $sess_name" fi @@ -694,7 +851,7 @@ function stop_lttng_tracing () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on stop tracing for session: $sess_name" + ok $? "Stop lttng tracing for session $sess_name failed as expected" else ok $ret "Stop lttng tracing for session $sess_name" fi @@ -719,7 +876,7 @@ function destroy_lttng_session () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on session deletion $sess_name" + ok $? "Destroy session $sess_name failed as expected" else ok $ret "Destroy session $sess_name" fi @@ -753,7 +910,7 @@ function lttng_snapshot_add_output () ret=$? if [[ $expected_to_fail -eq 1 ]]; then test "$ret" -ne "0" - ok $? "Failed to add a snapshot output file://$trace_path as expected" + ok $? "Added snapshot output file://$trace_path failed as expected" else ok $ret "Added snapshot output file://$trace_path" fi @@ -779,7 +936,7 @@ function lttng_snapshot_del_output () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expect fail on deletion of snapshot output id $id" + ok $? "Deleted snapshot output id $id failed as expected" else ok $ret "Deleted snapshot output id $id" fi @@ -817,7 +974,7 @@ function lttng_save() local opts=$2 $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST - ok $? "Session successfully saved" + ok $? "Session saved" } function lttng_load() @@ -825,7 +982,7 @@ function lttng_load() local opts=$1 $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST - ok $? "Load command successful" + ok $? "Load command with opts: $opts" } function lttng_track() @@ -838,7 +995,7 @@ function lttng_track() test $ret -ne "0" ok $? "Track command failed as expected with opts: $opts" else - ok $ret "Track command success as expected with opts: $opts" + ok $ret "Track command with opts: $opts" fi } @@ -862,7 +1019,7 @@ function lttng_untrack() test $ret -ne "0" ok $? "Untrack command failed as expected with opts: $opts" else - ok $ret "Untrack command success as expected with opts: $opts" + ok $ret "Untrack command with opts: $opts" fi } @@ -876,6 +1033,44 @@ function lttng_untrack_fail() lttng_untrack 1 "$@" } +function add_context_lttng() +{ + local expected_to_fail="$1" + local domain="$2" + local session_name="$3" + local channel_name="$4" + local type="$5" + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN add-context -s $session_name -c $channel_name -t $type $domain 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test $ret -ne "0" + ok $? "Add context command failed as expected for type: $type" + else + ok $ret "Add context command for type: $type" + fi +} + +function add_context_ust_ok() +{ + add_context_lttng 0 -u "$@" +} + +function add_context_ust_fail() +{ + add_context_lttng 1 -u "$@" +} + +function add_context_kernel_ok() +{ + add_context_lttng 0 -k "$@" +} + +function add_context_kernel_fail() +{ + add_context_lttng 1 -k "$@" +} + function trace_matches () { local event_name=$1