X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fperiodical-metadata-flush%2Ftest_periodical_metadata_flush;fp=tests%2Fregression%2Fust%2Fperiodical-metadata-flush%2Ftest_periodical_metadata_flush;h=f1132c2e49e9218b465f1688b037f146a1891713;hp=56c23ff408a98b4704a0a4ff1743a66983673ad5;hb=c1896e2d809e0d32d2d9b8a840755de6d5d70eaf;hpb=f7169e41979bb8a57ecf2ff3683fefa74e05179b diff --git a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush index 56c23ff40..f1132c2e4 100755 --- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush +++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush @@ -6,8 +6,8 @@ TEST_DESC="UST tracer - Tracing with per UID buffers and periodical flush" -CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../../.. +CURDIR=$(dirname "$0")/ +TESTDIR="$CURDIR/../../.." NR_ITER=100 NR_USEC_WAIT=100000 TESTAPP_PATH="$TESTDIR/utils/testapp" @@ -15,12 +15,12 @@ TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" SESSION_NAME="periodical-flush" EVENT_NAME="tp:tptest" -BIN_NAME="gen-nevents" NUM_TESTS=38 APP_TMP_FILE=$(mktemp -u -t tmp.test_periodical_metadata_flush_ust_app_tmp_file.XXXXXX) -APPS_PID= +APP_PIDS=() -source $TESTDIR/utils/utils.sh +# shellcheck source-path=SCRIPTDIR/../../../ +source "$TESTDIR/utils/utils.sh" if [ ! -x "$TESTAPP_BIN" ]; then BAIL_OUT "No UST events binary detected." @@ -33,7 +33,7 @@ function enable_channel_per_uid() local sess_name=$1 local channel_name=$2 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1 + "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" enable-channel --buffers-uid -u "$channel_name" -s "$sess_name" --switch-timer 100000 >/dev/null 2>&1 ok $? "Enable channel $channel_name per UID for session $sess_name" } @@ -42,7 +42,7 @@ function enable_channel_per_pid() local sess_name=$1 local channel_name=$2 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1 + "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" enable-channel --buffers-pid -u "$channel_name" -s "$sess_name" --switch-timer 100000 >/dev/null 2>&1 ok $? "Enable channel $channel_name per UID for session $sess_name" } @@ -51,7 +51,7 @@ function enable_metadata_per_uid() local sess_name=$1 local channel_name="metadata" - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 200000 >/dev/null 2>&1 + "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" enable-channel --buffers-uid -u "$channel_name" -s "$sess_name" --switch-timer 200000 2>&1 ok $? "Enable channel $channel_name per UID for session $sess_name" } @@ -60,7 +60,7 @@ function enable_metadata_per_pid() local sess_name=$1 local channel_name="metadata" - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 200000 >/dev/null 2>&1 + "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" enable-channel --buffers-pid -u "$channel_name" -s "$sess_name" --switch-timer 200000 >/dev/null 2>&1 ok $? "Enable channel $channel_name per PID for session $sess_name" } @@ -68,8 +68,8 @@ function validate_trace() { local out - out=$("$BABELTRACE_BIN" $TRACE_PATH | grep $EVENT_NAME | wc -l) - if [ $out -eq 0 ]; then + out=$("$BABELTRACE_BIN" "$TRACE_PATH" | grep -c $EVENT_NAME) + if [ "$out" -eq 0 ]; then fail "Trace validation" diag "No event(s) found. We are supposed to have at least one." out=1 @@ -90,15 +90,15 @@ function check_app_tmp_file() sleep 0.5 done diag "Removing test app temporary file $APP_TMP_FILE" - rm -f $APP_TMP_FILE + rm -f "$APP_TMP_FILE" } function start_trace_app() { # Start application with a temporary file. - $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $APP_TMP_FILE & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event "$APP_TMP_FILE" & ret=$? - APPS_PID="${APPS_PID} ${!}" + APP_PIDS+=(${!}) ok $ret "Start application to trace" } @@ -111,20 +111,18 @@ function start_check_trace_app() function wait_trace_apps() { - for p in ${APPS_PID}; do - wait ${p} 2>/dev/null - done - APPS_PID= + wait "${APP_PIDS[@]}" 2> /dev/null + APP_PIDS=() } test_after_app_pid() { local out - APPS_PID= + APP_PIDS=() diag "Start application AFTER tracing is started" - create_lttng_session_ok $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME "$TRACE_PATH" enable_metadata_per_pid $SESSION_NAME enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" @@ -137,20 +135,17 @@ test_after_app_pid() { # Make sure the application does not generate any more data, # thus ensuring that we are not flushing a packet concurrently # with validate_trace. - for p in ${APPS_PID}; do - kill -s SIGSTOP ${p} - done + kill -s SIGSTOP "${APP_PIDS[@]}" # Give time to the consumer to write inflight data. sleep 2 + # shellcheck disable=SC2119 validate_trace out=$? - for p in ${APPS_PID}; do - kill -s SIGKILL ${p} - wait ${p} 2>/dev/null - done + kill -s SIGKILL "${APP_PIDS[@]}" + wait "${APP_PIDS[@]}" 2>/dev/null stop_lttng_tracing_ok $SESSION_NAME destroy_lttng_session_ok $SESSION_NAME @@ -161,16 +156,15 @@ test_after_app_pid() { test_before_app_pid() { local out - local tmp_file="/tmp/lttng_test_ust.42.file" - APPS_PID= + APP_PIDS=() diag "Start application BEFORE tracing is started" start_trace_app # Start application before tracing - create_lttng_session_ok $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME "$TRACE_PATH" enable_metadata_per_pid $SESSION_NAME enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" @@ -183,20 +177,17 @@ test_before_app_pid() { # Make sure the application does not generate any more data, # thus ensuring that we are not flushing a packet concurrently # with validate_trace. - for p in ${APPS_PID}; do - kill -s SIGSTOP ${p} - done + kill -s SIGSTOP "${APP_PIDS[@]}" # Give time to the consumer to write inflight data. sleep 2 + # shellcheck disable=SC2119 validate_trace out=$? - for p in ${APPS_PID}; do - kill -s SIGKILL ${p} - wait ${p} 2>/dev/null - done + kill -s SIGKILL "${APP_PIDS[@]}" + wait "${APP_PIDS[@]}" 2>/dev/null stop_lttng_tracing_ok $SESSION_NAME destroy_lttng_session_ok $SESSION_NAME @@ -209,11 +200,11 @@ test_before_app_pid() { test_after_app_uid() { local out - APPS_PID= + APP_PIDS=() diag "Start application AFTER tracing is started" - create_lttng_session_ok $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME "$TRACE_PATH" enable_metadata_per_uid $SESSION_NAME enable_channel_per_uid $SESSION_NAME "channel0" enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" @@ -226,21 +217,17 @@ test_after_app_uid() { # Make sure the application does not generate any more data, # thus ensuring that we are not flushing a packet concurrently # with validate_trace. - for p in ${APPS_PID}; do - kill -s SIGSTOP ${p} - done - + kill -s SIGSTOP "${APP_PIDS[@]}" # Give time to the consumer to write inflight data. sleep 2 + # shellcheck disable=SC2119 validate_trace out=$? - for p in ${APPS_PID}; do - kill -s SIGKILL ${p} - wait ${p} 2>/dev/null - done + kill -s SIGKILL "${APP_PIDS[@]}" + wait "${APP_PIDS[@]}" stop_lttng_tracing_ok $SESSION_NAME destroy_lttng_session_ok $SESSION_NAME @@ -252,14 +239,14 @@ test_after_app_uid() { test_before_app_uid() { local out - APPS_PID= + APP_PIDS=() diag "Start application BEFORE tracing is started" # Start application before tracing start_trace_app - create_lttng_session_ok $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME "$TRACE_PATH" enable_metadata_per_uid $SESSION_NAME enable_channel_per_uid $SESSION_NAME "channel0" enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" @@ -272,20 +259,17 @@ test_before_app_uid() { # Make sure the application does not generate any more data, # thus ensuring that we are not flushing a packet concurrently # with validate_trace. - for p in ${APPS_PID}; do - kill -s SIGSTOP ${p} - done + kill -s SIGSTOP "${APP_PIDS[@]}" # Give time to the consumer to write inflight data. sleep 2 + # shellcheck disable=SC2119 validate_trace out=$? - for p in ${APPS_PID}; do - kill -s SIGKILL ${p} - wait ${p} 2>/dev/null - done + kill -s SIGKILL "${APP_PIDS[@]}" + wait "${APP_PIDS[@]}" stop_lttng_tracing_ok $SESSION_NAME destroy_lttng_session_ok $SESSION_NAME @@ -310,13 +294,15 @@ TESTS=( TEST_COUNT=${#TESTS[@]} i=0 +# shellcheck disable=SC2119 start_lttng_sessiond -while [ $i -lt $TEST_COUNT ]; do +while [ $i -lt "$TEST_COUNT" ]; do TRACE_PATH=$(mktemp -d -t tmp.test_periodical_metadata_flush_ust_trace_path.XXXXXX) ${TESTS[$i]} - rm -rf $TRACE_PATH - let "i++" + rm -rf "$TRACE_PATH" + (( "i++" )) done +# shellcheck disable=SC2119 stop_lttng_sessiond