X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=05d88650e9f369bfd84ed939c405967d2de314b3;hp=5b81febb6bfb5c52ba9e3eff2c451175603326ad;hb=192ac418bed152e8655e250e723d3c6b8814c747;hpb=1c362dc78cf2e28c8935efcb5d4a85ef5d5967ba diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 5b81febb6..05d88650e 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -16,10 +16,14 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA SESSIOND_BIN="lttng-sessiond" +SESSIOND_MATCH=".*lttng-sess.*" SESSIOND_PIDS="" RUNAS_BIN="lttng-runas" +RUNAS_MATCH=".*lttng-runas.*" CONSUMERD_BIN="lttng-consumerd" +CONSUMERD_MATCH=".*lttng-consumerd.*" RELAYD_BIN="lttng-relayd" +RELAYD_MATCH=".*lttng-relayd.*" RELAYD_PIDS="" LTTNG_BIN="lttng" BABELTRACE_BIN="babeltrace" @@ -31,10 +35,12 @@ 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. +# We set the default UST register timeout and network and app socket 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 +export LTTNG_NETWORK_SOCKET_TIMEOUT=-1 +export LTTNG_APP_SOCKET_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 @@ -304,7 +310,7 @@ function start_lttng_relayd_opt() DIR=$(readlink -f $TESTDIR) - if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then + if [ -z $(pgrep $RELAYD_MATCH) ]; 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 @@ -321,7 +327,7 @@ function start_lttng_relayd_opt() pass "Start lttng-relayd (opt: $opt)" fi - RELAYD_PIDS=$(pgrep --full lt-$RELAYD_BIN) + RELAYD_PIDS=$(pgrep $RELAYD_MATCH) } function start_lttng_relayd() @@ -352,7 +358,7 @@ function stop_lttng_relayd_opt() else out=1 while [ -n "$out" ]; do - out=$(pgrep --full lt-$RELAYD_BIN) + out=$(pgrep $RELAYD_MATCH) sleep 0.5 done if [ $withtap -eq "1" ]; then @@ -395,7 +401,7 @@ function start_lttng_sessiond_opt() : ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/} export LTTNG_SESSION_CONFIG_XSD_PATH - if [ -z $(pgrep --full lt-$SESSIOND_BIN) ]; then + if [ -z $(pgrep ${SESSIOND_MATCH}) ]; then # Have a load path ? 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" @@ -408,7 +414,7 @@ function start_lttng_sessiond_opt() ok $status "Start session daemon" fi fi - SESSIOND_PIDS=$(pgrep --full lt-$SESSIOND_BIN) + SESSIOND_PIDS=$(pgrep $SESSIOND_MATCH) } function start_lttng_sessiond() @@ -432,13 +438,13 @@ function stop_lttng_sessiond_opt() return fi - local pids="${SESSIOND_PIDS} $(pgrep --full $RUNAS_BIN)" + local pids="${SESSIOND_PIDS} $(pgrep $RUNAS_MATCH)" if [ -n "$2" ]; then kill_opt="$kill_opt -s $signal" fi if [ $withtap -eq "1" ]; then - diag "Killing lt-$SESSIOND_BIN pids: $(echo $pids | tr '\n' ' ')" + diag "Killing $SESSIOND_BIN and lt-$SESSIOND_BIN pids: $(echo $pids | tr '\n' ' ')" fi kill $kill_opt $pids 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST @@ -449,12 +455,12 @@ function stop_lttng_sessiond_opt() else out=1 while [ -n "$out" ]; do - out=$(pgrep --full lt-$SESSIOND_BIN) + out=$(pgrep ${SESSIOND_MATCH}) sleep 0.5 done out=1 while [ -n "$out" ]; do - out=$(pgrep --full $CONSUMERD_BIN) + out=$(pgrep $CONSUMERD_MATCH) sleep 0.5 done @@ -486,12 +492,12 @@ function sigstop_lttng_sessiond_opt() return fi - PID_SESSIOND="$(pgrep --full lt-$SESSIOND_BIN) $(pgrep --full $RUNAS_BIN)" + PID_SESSIOND="$(pgrep ${SESSIOND_MATCH}) $(pgrep $RUNAS_MATCH)" kill_opt="$kill_opt -s $signal" if [ $withtap -eq "1" ]; then - diag "Sending SIGSTOP to lt-$SESSIOND_BIN pids: $(echo $PID_SESSIOND | tr '\n' ' ')" + diag "Sending SIGSTOP to lt-$SESSIOND_BIN and $SESSIOND_BIN pids: $(echo $PID_SESSIOND | tr '\n' ' ')" fi kill $kill_opt $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST @@ -502,7 +508,7 @@ function sigstop_lttng_sessiond_opt() else out=1 while [ $out -ne 0 ]; do - pid=$(pgrep --full lt-$SESSIOND_BIN) + pid=$(pgrep $SESSIOND_MATCH) # Wait until state becomes stopped for session # daemon(s). @@ -537,7 +543,7 @@ function stop_lttng_consumerd_opt() local signal=$2 local kill_opt="" - PID_CONSUMERD=`pgrep --full $CONSUMERD_BIN` + PID_CONSUMERD=$(pgrep $CONSUMERD_MATCH) if [ -n "$2" ]; then kill_opt="$kill_opt -s $signal" @@ -558,7 +564,7 @@ function stop_lttng_consumerd_opt() else out=1 while [ $out -ne 0 ]; do - pid=$(pgrep --full $CONSUMERD_BIN) + pid=$(pgrep $CONSUMERD_MATCH) # If consumerds are still present check their status. # A zombie status qualifies the consumerd as *killed* @@ -594,7 +600,7 @@ function sigstop_lttng_consumerd_opt() local signal=SIGSTOP local kill_opt="" - PID_CONSUMERD=`pgrep --full $CONSUMERD_BIN` + PID_CONSUMERD=$(pgrep $CONSUMERD_MATCH) kill_opt="$kill_opt -s $signal" @@ -613,7 +619,7 @@ function sigstop_lttng_consumerd_opt() else out=1 while [ $out -ne 0 ]; do - pid=$(pgrep --full $CONSUMERD_BIN) + pid=$(pgrep $CONSUMERD_MATCH) # Wait until state becomes stopped for all # consumers. @@ -731,6 +737,24 @@ function enable_lttng_mmap_overwrite_kernel_channel() ok $? "Enable channel $channel_name for session $sess_name" } +function enable_lttng_mmap_discard_small_kernel_channel() +{ + local sess_name=$1 + local channel_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --discard --subbuf-size=$(getconf PAGE_SIZE) --num-subbuf=2 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ok $? "Enable small discard channel $channel_name for session $sess_name" +} + +function enable_lttng_mmap_overwrite_small_kernel_channel() +{ + local sess_name=$1 + local channel_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite --subbuf-size=$(getconf PAGE_SIZE) --num-subbuf=2 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ok $? "Enable small discard channel $channel_name for session $sess_name" +} + function enable_lttng_mmap_overwrite_ust_channel() { local sess_name=$1 @@ -1115,10 +1139,27 @@ function lttng_save() function lttng_load() { - local opts=$1 + local expected_to_fail=$1 + local opts=$2 $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST - ok $? "Load command with opts: $opts" + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test $ret -ne "0" + ok $? "Load command failed as expected with opts: $opts" + else + ok $ret "Load command with opts: $opts" + fi +} + +function lttng_load_ok() +{ + lttng_load 0 "$@" +} + +function lttng_load_fail() +{ + lttng_load 1 "$@" } function lttng_track() @@ -1220,7 +1261,7 @@ function trace_matches () if [ "$count" -ne "$nr_iter" ]; then fail "Trace match" - diag "$count events found in trace" + diag "$count matching events found in trace" else pass "Trace match" fi @@ -1272,6 +1313,47 @@ function validate_trace return $ret } +function validate_trace_count +{ + local event_name=$1 + local trace_path=$2 + local expected_count=$3 + + which $BABELTRACE_BIN >/dev/null + if [ $? -ne 0 ]; then + skip 0 "Babeltrace binary not found. Skipping trace validation" + fi + + cnt=0 + 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 + cnt=$(($cnt + $traced)) + done + IFS=$OLDIFS + test $cnt -eq $expected_count + ok $? "Read a total of $cnt events, expected $expected_count" +} + +function trace_first_line +{ + local trace_path=$1 + + which $BABELTRACE_BIN >/dev/null + if [ $? -ne 0 ]; then + skip 0 "Babeltrace binary not found. Skipping trace validation" + fi + + $BABELTRACE_BIN $trace_path 2>/dev/null | head -n 1 +} + function validate_trace_exp() { local event_exp=$1 @@ -1332,29 +1414,54 @@ function validate_trace_empty() return $ret } -function metadata_regenerate () +function regenerate_metadata () +{ + local expected_to_fail=$1 + local sess_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN regenerate metadata -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test "$ret" -ne "0" + ok $? "Expected fail on regenerate metadata $sess_name" + else + ok $ret "Metadata regenerate $sess_name" + fi +} + +function regenerate_metadata_ok () +{ + regenerate_metadata 0 "$@" +} + +function regenerate_metadata_fail () +{ + regenerate_metadata 1 "$@" +} + +function regenerate_statedump () { local expected_to_fail=$1 local sess_name=$2 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN metadata regenerate -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + $TESTDIR/../src/bin/lttng/$LTTNG_BIN regenerate statedump -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on regenerate $sess_name" + ok $? "Expected fail on regenerate statedump $sess_name" else ok $ret "Metadata regenerate $sess_name" fi } -function metadata_regenerate_ok () +function regenerate_statedump_ok () { - metadata_regenerate 0 "$@" + regenerate_statedump 0 "$@" } -function metadata_regenerate_fail () +function regenerate_statedump_fail () { - metadata_regenerate 1 "$@" + regenerate_statedump 1 "$@" } function destructive_tests_enabled ()