X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=2d585fd531595920ebc02c0ba89296081f009e21;hp=e727aa6349f5075fcf04531374af08b9092c9571;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=1d20c959e3aa1a9a205fd7fff2d912b6bada1d23 diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test index e727aa634..2d585fd53 100755 --- a/tests/regression/tools/snapshots/ust_test +++ b/tests/regression/tools/snapshots/ust_test @@ -19,16 +19,14 @@ TEST_DESC="Snapshots - UST tracing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. EVENT_NAME="tp:tptest" -PID_RELAYD=0 SESSION_NAME="" CHANNEL_NAME="snapchan" TESTAPP_PATH="$TESTDIR/utils/testapp" TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" -NR_ITER=2000000 -NR_USEC_WAIT=100 +APPS_PID= -NUM_TESTS=76 +NUM_TESTS=100 TRACE_PATH=$(mktemp -d) @@ -48,11 +46,13 @@ NUM_TESTS=$(($NUM_TESTS + ($NR_SNAPSHOT * 2))) function start_test_app() { - local tmp_file="/tmp/lttng_test_ust.42.file" + local tmp_file=$(mktemp -u) # Start application with a temporary file. - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file & - ok $? "Start application to trace" + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $tmp_file & + ret=$? + APPS_PID="${APPS_PID} ${!}" + ok $ret "Start application to trace" # Wait for the application file to appear indicating that at least one # tracepoint has been fired. @@ -63,11 +63,22 @@ function start_test_app() rm -f $tmp_file } -function kill_test_app() +function wait_test_apps() +{ + diag "Waiting for $TESTAPP_NAME" + for p in ${APPS_PID}; do + wait ${p} 2>/dev/null + done +} + +function stop_test_apps() { - diag "Killing $TESTAPP_NAME" - PID_APP=`pidof $TESTAPP_NAME` - kill $PID_APP >/dev/null 2>&1 + diag "Stopping $TESTAPP_NAME" + for p in ${APPS_PID}; do + kill ${p} + wait ${p} 2>/dev/null + done + APPS_PID= } function snapshot_add_output () @@ -116,6 +127,31 @@ function enable_mmap_overwrite_subbuf_ust_channel () ok $? "Enable channel $channel_name for session $sess_name with subbuf size $subbuf_size" } +function enable_mmap_small_discard_ust_channel () +{ + local sess_name=$1 + local chan_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name \ + $chan_name -u --output mmap --discard \ + --subbuf-size $(getconf PAGE_SIZE) --num-subbuf 2 \ + > /dev/null 2>&1 + + ok $? "Enable channel $channel_name for session $sess_name with small discard buffers" +} + +function enable_mmap_small_overwrite_ust_channel () +{ + local sess_name=$1 + local chan_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name \ + $chan_name -u --output mmap --overwrite \ + --subbuf-size $(getconf PAGE_SIZE) --num-subbuf 2 \ + > /dev/null 2>&1 + + ok $? "Enable channel $channel_name for session $sess_name with small discard buffers" +} function test_ust_list_output () { @@ -124,9 +160,9 @@ function test_ust_list_output () diag "Test UST snapshot output listing" create_lttng_session_no_output $SESSION_NAME enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME + start_lttng_tracing_ok $SESSION_NAME snapshot_add_output $SESSION_NAME "file://$TRACE_PATH" ${output_names[0]} @@ -143,42 +179,138 @@ function test_ust_list_output () ok $? "Snapshot named ${output_names[1]} present in list-output listing" - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME } function test_ust_local_snapshot () { + NR_ITER=-1 + NR_USEC_WAIT=100 + diag "Test local UST snapshots" create_lttng_session_no_output $SESSION_NAME enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app lttng_snapshot_record $SESSION_NAME - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test validate_trace $EVENT_NAME $TRACE_PATH/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH + fi + + stop_test_apps +} + +function test_ust_local_snapshot_small_discard_buffers () +{ + NR_ITER=10000 + NR_USEC_WAIT=0 + OLDCPUSET=$(taskset -p $$) + + diag "Test local UST snapshots with small discard buffers" + taskset -p 0x1 $$ 1>/dev/null 2>&1 # CPU 0 only + create_lttng_session_no_output $SESSION_NAME + enable_mmap_small_discard_ust_channel $SESSION_NAME $CHANNEL_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH + + # Run test apps, wait for them to complete. + start_test_app + wait_test_apps + + # Take first snapshot, remember first line. + lttng_snapshot_record $SESSION_NAME + FIRST_LINE="$(trace_first_line $TRACE_PATH/)" + diag "First line (1st snapshot): $FIRST_LINE" + rm -rf $TRACE_PATH/ + + # Run test apps, wait for them to complete. + start_test_app + wait_test_apps + + # Take second snapshot, remember first line. + lttng_snapshot_record $SESSION_NAME + FIRST_LINE_2="$(trace_first_line $TRACE_PATH/)" + diag "First line (2nd snapshot): $FIRST_LINE_2" + rm -rf $TRACE_PATH/ + + if [ x"$FIRST_LINE" != x"$FIRST_LINE_2" ]; then + fail "First snapshot event do not match." + else + pass "First snapshot event match." + fi + + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME + taskset -p $OLDCPUSET $$ 1>/dev/null 2>&1 +} + +function test_ust_local_snapshot_small_overwrite_buffers () +{ + NR_ITER=10000 + NR_USEC_WAIT=0 + OLDCPUSET=$(taskset -p $$) + + diag "Test local UST snapshots with small overwrite buffers" + taskset -p 0x1 $$ 1>/dev/null 2>&1 # CPU 0 only + create_lttng_session_no_output $SESSION_NAME + enable_mmap_small_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH + + # Run test apps, wait for them to complete. + start_test_app + wait_test_apps + + # Take first snapshot, remember first line. + lttng_snapshot_record $SESSION_NAME + FIRST_LINE="$(trace_first_line $TRACE_PATH/)" + diag "First line (1st snapshot): $FIRST_LINE" + rm -rf $TRACE_PATH/ + + # Run test apps, wait for them to complete. + start_test_app + wait_test_apps + + # Take second snapshot, remember first line. + lttng_snapshot_record $SESSION_NAME + FIRST_LINE_2="$(trace_first_line $TRACE_PATH/)" + diag "First line (2nd snapshot): $FIRST_LINE_2" + rm -rf $TRACE_PATH/ + + if [ x"$FIRST_LINE" != x"$FIRST_LINE_2" ]; then + pass "First snapshot event do not match." else - break + fail "First snapshot event match." fi - kill_test_app + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME + taskset -p $OLDCPUSET $$ 1>/dev/null 2>&1 } function test_ust_local_snapshot_max_size () { - subbuf_size=8192 - num_cpus=`nproc` + NR_ITER=-1 + NR_USEC_WAIT=100 + page_size=`getconf PAGE_SIZE` + num_cpus=$(conf_proc_count) + + # The minimum subbuf size is the platform PAGE_SIZE + subbuf_size=$(($page_size*2)) # The minimum size limit is min(subbuf_size) * nb_streams max_size=$(($subbuf_size*$num_cpus)) @@ -188,8 +320,8 @@ function test_ust_local_snapshot_max_size () enable_mmap_overwrite_subbuf_ust_channel $SESSION_NAME $CHANNEL_NAME $subbuf_size - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME snapshot_add_output $SESSION_NAME "file://$TRACE_PATH" "" $max_size @@ -209,8 +341,8 @@ function test_ust_local_snapshot_max_size () pass "Tracefiles size sum validation" - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test validate_trace $EVENT_NAME $TRACE_PATH/ @@ -220,7 +352,7 @@ function test_ust_local_snapshot_max_size () rm -rf $TRACE_PATH fi - kill_test_app + stop_test_apps } function test_ust_local_snapshot_large_metadata () @@ -233,22 +365,20 @@ function test_ust_local_snapshot_large_metadata () diag "Test local UST snapshots with > 4kB metadata" create_lttng_session_no_output $SESSION_NAME enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $LM_EVENT $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH $LM_BIN 1 1 ok $? "Start application to trace" lttng_snapshot_record $SESSION_NAME - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test validate_trace $LM_EVENT $TRACE_PATH/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi } @@ -263,67 +393,71 @@ function enable_channel_per_uid_mmap_overwrite() function test_ust_per_uid_local_snapshot () { - diag "Test local UST snapshots" + NR_ITER=-1 + NR_USEC_WAIT=100 + diag "Test per-uid local UST snapshots" create_lttng_session_no_output $SESSION_NAME enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app lttng_snapshot_record $SESSION_NAME - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test validate_trace $EVENT_NAME $TRACE_PATH/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi - kill_test_app + stop_test_apps } function test_ust_per_uid_local_snapshot_post_mortem () { + NR_ITER=-1 + NR_USEC_WAIT=100 + diag "Test local UST snapshots post-mortem" create_lttng_session_no_output $SESSION_NAME enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app - kill_test_app + stop_test_apps lttng_snapshot_record $SESSION_NAME - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test validate_trace $EVENT_NAME $TRACE_PATH/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi } function test_ust_local_snapshots () { + NR_ITER=-1 + NR_USEC_WAIT=100 + diag "Test $NR_SNAPSHOT local UST snapshots" create_lttng_session_no_output $SESSION_NAME enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app @@ -337,14 +471,12 @@ function test_ust_local_snapshots () if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi done - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME - kill_test_app + stop_test_apps } plan_tests $NUM_TESTS @@ -352,14 +484,16 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" start_lttng_sessiond - tests=( test_ust_list_output test_ust_local_snapshot test_ust_local_snapshot_max_size test_ust_per_uid_local_snapshot test_ust_per_uid_local_snapshot_post_mortem test_ust_local_snapshot_large_metadata - test_ust_local_snapshots) + test_ust_local_snapshots + test_ust_local_snapshot_small_discard_buffers + test_ust_local_snapshot_small_overwrite_buffers +) for fct_test in ${tests[@]}; do