X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_ust_streaming;h=38bbc71ff35630a641d8b29014e19cebf3bc8eb6;hp=52330a5c9f8362b1625cbe05f17b71a257c5edbf;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=0fc2834cb1892927708c858baf0147f1cddd1219 diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming index 52330a5c9..38bbc71ff 100755 --- a/tests/regression/tools/snapshots/test_ust_streaming +++ b/tests/regression/tools/snapshots/test_ust_streaming @@ -2,37 +2,26 @@ # # Copyright (C) - 2013 David Goulet # -# This library is free software; you can redistribute it and/or modify it under -# the terms of the GNU Lesser General Public License as published by the Free -# Software Foundation; version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this library; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-License-Identifier: LGPL-2.1-only + TEST_DESC="Streaming - Snapshot UST tracing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. EVENT_NAME="tp:tptest" -PID_RELAYD=0 SESSION_NAME="" CHANNEL_NAME="chan1" BIN_NAME="gen-nevents" TESTAPP_PATH="$TESTDIR/utils/testapp" TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" -NR_ITER=2000000 +NR_ITER=-1 NR_USEC_WAIT=100 APPS_PID= TRACE_PATH=$(mktemp -d) -NUM_TESTS=49 +NUM_TESTS=75 source $TESTDIR/utils/utils.sh @@ -58,10 +47,10 @@ function snapshot_add_output () # Start trace application and return once one event has been hit. 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 & + $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" @@ -80,8 +69,9 @@ function stop_test_apps() diag "Stopping $TESTAPP_NAME" for p in ${APPS_PID}; do kill ${p} - wait ${p} 2>&1 + wait ${p} 2>/dev/null done + APPS_PID= } # Test a snapshot using a default name for the output destination. @@ -90,8 +80,8 @@ function test_ust_default_name_with_del() diag "Test UST snapshot streaming with default name with delete output" 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 + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME start_test_app @@ -99,26 +89,25 @@ function test_ust_default_name_with_del() lttng_snapshot_record $SESSION_NAME # Validate test - echo $TRACE_PATH/$HOSTNAME/snapshot-1 - validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1* + validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1* if [ $? -ne 0 ]; then stop_test_apps return $? fi - lttng_snapshot_del_output $SESSION_NAME 1 + lttng_snapshot_del_output_ok $SESSION_NAME 1 snapshot_add_output $SESSION_NAME "net://localhost" lttng_snapshot_record $SESSION_NAME # Validate test with the next ID since a del output was done prior. - validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-2* + validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-2* if [ $? -ne 0 ]; then stop_test_apps return $? fi - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME stop_test_apps @@ -131,17 +120,17 @@ function test_ust_default_name() diag "Test UST snapshot streaming with default name" 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 + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME start_test_app snapshot_add_output $SESSION_NAME "net://localhost" 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/$HOSTNAME/snapshot-1* + validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1* out=$? stop_test_apps @@ -154,17 +143,17 @@ function test_ust_default_name_custom_uri() diag "Test UST snapshot streaming with default name with custom URL" 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 + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME start_test_app snapshot_add_output $SESSION_NAME "-C tcp://localhost:5342 -D tcp://localhost:5343" 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/$HOSTNAME/snapshot-1* + validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1* out=$? stop_test_apps @@ -181,20 +170,20 @@ function test_ust_custom_name() diag "Test UST snapshot streaming with custom name" 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 + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME start_test_app snapshot_add_output $SESSION_NAME "net://localhost" $name 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 - if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then + if ls $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name* &> /dev/null; then ok 0 "Custom name snapshot exists" # Validate test - validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$name-* + validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name-* out=$? else fail "No custom name snapshot found" @@ -206,6 +195,33 @@ function test_ust_custom_name() return $out } +function test_ust_n_snapshot() +{ + diag "Test ust snapshot streaming multiple consecutive snapshot" + create_lttng_session_no_output $SESSION_NAME + enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + snapshot_add_output $SESSION_NAME "net://localhost" $name + start_test_app + for i in {1..5}; + do + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_record $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1* + if [ $? -ne 0 ]; then + return 1 + fi + set -u + rm -rf $TRACE_PATH/$HOSTNAME + set +u + done + + destroy_lttng_session_ok $SESSION_NAME + stop_test_apps + return 0 +} + plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" @@ -219,7 +235,12 @@ fi start_lttng_relayd "-o $TRACE_PATH" start_lttng_sessiond -tests=( test_ust_default_name_with_del test_ust_default_name test_ust_custom_name test_ust_default_name_custom_uri ) +tests=( test_ust_default_name_with_del + test_ust_default_name + test_ust_custom_name + test_ust_default_name_custom_uri + test_ust_n_snapshot +) for fct_test in ${tests[@]}; do