X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=24f43aec66033248973f737256f6802178cde5aa;hb=f33e65faf5e4ffa7d249f58bf6dbdaf2bcb28693;hp=54321817dc28fe575b5d62dedbb6278c52dd6f72;hpb=03f66fb8271904c7bca9d3cfd5b3cf1d9c4e5221;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 54321817d..24f43aec6 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Julien Desfossez <jdesfossez@efficios.com>
+# Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
 #
-# 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="Snapshots - UST tracing"
 
 CURDIR=$(dirname $0)/
@@ -26,7 +16,7 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 APPS_PID=
 
-NUM_TESTS=100
+NUM_TESTS=104
 
 TRACE_PATH=$(mktemp -d)
 
@@ -42,14 +32,14 @@ if [ -z $1 ]; then
 fi
 NR_SNAPSHOT=$1
 
-NUM_TESTS=$(($NUM_TESTS + ($NR_SNAPSHOT * 2)))
+NUM_TESTS=$(($NUM_TESTS + ($NR_SNAPSHOT * 3)))
 
 function start_test_app()
 {
 	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"
@@ -119,9 +109,11 @@ function enable_mmap_overwrite_subbuf_ust_channel ()
 	local sess_name=$1
 	local chan_name=$2
 	local subbuf_size=$3
+	local subbuf_count=$4
 
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name \
 		$chan_name -u --output mmap --overwrite \
+		--num-subbuf=$subbuf_count \
 		--subbuf-size $subbuf_size > /dev/null 2>&1
 
 	ok $? "Enable channel $channel_name for session $sess_name with subbuf size $subbuf_size"
@@ -156,8 +148,6 @@ function enable_mmap_small_overwrite_ust_channel ()
 function test_ust_list_output ()
 {
 	output_names=("randomname" "somesnapshot")
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 
 	diag "Test UST snapshot output listing"
 	create_lttng_session_no_output $SESSION_NAME
@@ -187,7 +177,7 @@ function test_ust_list_output ()
 
 function test_ust_local_snapshot ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test local UST snapshots"
@@ -195,7 +185,7 @@ function test_ust_local_snapshot ()
 	enable_lttng_mmap_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
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -205,6 +195,7 @@ function test_ust_local_snapshot ()
 	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
+	validate_trace_path_ust_uid_snapshot "$TRACE_PATH" "" "snapshot-1" 0
 	validate_trace $EVENT_NAME $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
@@ -226,7 +217,7 @@ function test_ust_local_snapshot_small_discard_buffers ()
 	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
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Run test apps, wait for them to complete.
 	start_test_app
@@ -271,7 +262,7 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 	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
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Run test apps, wait for them to complete.
 	start_test_app
@@ -306,52 +297,67 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 
 function test_ust_local_snapshot_max_size ()
 {
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
-	page_size=`getconf PAGE_SIZE`
-	num_cpus=$(conf_proc_count)
+	local possible_cpus
+	local cpus_list
+	local subbuf_size
+	local subbuf_count
+	local snapshot_max_size
+	local channel_max_size_per_cpu
 
-	# The minimum subbuf size is the platform PAGE_SIZE
-	subbuf_size=$(($page_size*2))
+	IFS=" " read -r -a cpus_list <<< "$(get_exposed_cpus_list)"
 
-	# The minimum size limit is min(subbuf_size) * nb_streams
-	max_size=$(($subbuf_size*$num_cpus))
+	possible_cpus=$(get_possible_cpus_count)
+	subbuf_size=$(getconf PAGE_SIZE)
+	subbuf_count=8
+	snapshot_max_size=$((subbuf_size*possible_cpus))
+	channel_max_size_per_cpu=$((subbuf_size*subbuf_count))
 
 	diag "Test local UST snapshots with max size $max_size"
-	create_lttng_session_no_output $SESSION_NAME
+	create_lttng_session_no_output "$SESSION_NAME"
 
-	enable_mmap_overwrite_subbuf_ust_channel $SESSION_NAME $CHANNEL_NAME $subbuf_size
+	enable_mmap_overwrite_subbuf_ust_channel \
+		"$SESSION_NAME" "$CHANNEL_NAME" \
+		"$subbuf_size" "$subbuf_count"
 
-	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing_ok $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
+	snapshot_add_output "$SESSION_NAME" "file://$TRACE_PATH" "" "$snapshot_max_size"
 
-	# Returns once the application has at least fired ONE tracepoint.
-	start_test_app
+	# Fill all ring-buffers of the channel; assuming event size of at least one
+	# byte
+	for cpu in "${cpus_list[@]}";
+	do
+		diag "setting affinity to $cpu"
+		taskset --cpu-list "$cpu" "$TESTAPP_BIN" \
+			--iter "$channel_max_size_per_cpu"
+	done
+	diag "Filled channel ring-buffers"
 
-	lttng_snapshot_record $SESSION_NAME
+	lttng_snapshot_record "$SESSION_NAME"
 
 	# Check file size
-	sum_size_tracefiles=$(find $TRACE_PATH -name "${CHANNEL_NAME}_*" \
-		-exec stat -c '%s' {} \; | awk '{s = s + $1}END{print s}')
+	local snapshot_size
+	snapshot_size=$(find "$TRACE_PATH" -name "${CHANNEL_NAME}_*" \
+				-exec stat -c '%s' {} \; | \
+				awk '{s = s + $1}END{print s}')
 
-	if [ "$sum_size_tracefiles" -gt "$max_size" ]; then
+	if [ "$snapshot_size" -eq "$snapshot_max_size" ]; then
+		pass "Tracefiles size sum validation"
+	else
 		fail "Tracefiles size sum validation"
-		diag "Tracefiles size sum: $sum_size_tracefiles Expected max: $max_size"
+		diag "Tracefiles size sum: $snapshot_size Expected max: $snapshot_max_size"
 	fi
 
-	pass "Tracefiles size sum validation"
-
-	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session_ok $SESSION_NAME
+	stop_lttng_tracing_ok "$SESSION_NAME"
+	destroy_lttng_session_ok "$SESSION_NAME"
 
 	# Validate test
-	validate_trace $EVENT_NAME $TRACE_PATH/
+	validate_trace_path_ust_uid_snapshot "$TRACE_PATH" "" "snapshot-1" 0
 
-	if [ $? -eq 0 ]; then
+	if validate_trace "$EVENT_NAME" "$TRACE_PATH/"; then
 		# Only delete if successful
-		rm -rf $TRACE_PATH
+		rm -rf "$TRACE_PATH"
 	fi
 
 	stop_test_apps
@@ -359,8 +365,6 @@ function test_ust_local_snapshot_max_size ()
 
 function test_ust_local_snapshot_large_metadata ()
 {
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 	LM_EVENT="tp:tptest1,tp:tptest2,tp:tptest3,tp:tptest4,tp:tptest5"
 	LM_PATH="$TESTDIR/utils/testapp"
 	LM_NAME="gen-ust-nevents"
@@ -371,14 +375,15 @@ function test_ust_local_snapshot_large_metadata ()
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	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
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
+	$LM_BIN --iter 1 --wait 1
 	ok $? "Start application to trace"
 	lttng_snapshot_record $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
+	validate_trace_path_ust_uid_snapshot "$TRACE_PATH" "" "snapshot-1" 0
 	validate_trace $LM_EVENT $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
@@ -388,8 +393,6 @@ function test_ust_local_snapshot_large_metadata ()
 
 function enable_channel_per_uid_mmap_overwrite()
 {
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 	sess_name=$1
 	channel_name=$2
 
@@ -399,12 +402,14 @@ function enable_channel_per_uid_mmap_overwrite()
 
 function test_ust_per_uid_local_snapshot ()
 {
+	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_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -414,6 +419,7 @@ function test_ust_per_uid_local_snapshot ()
 	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
+	validate_trace_path_ust_uid_snapshot "$TRACE_PATH" "" "snapshot-1" 0
 	validate_trace $EVENT_NAME $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
@@ -425,7 +431,7 @@ function test_ust_per_uid_local_snapshot ()
 
 function test_ust_per_uid_local_snapshot_post_mortem ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test local UST snapshots post-mortem"
@@ -433,7 +439,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 	enable_channel_per_uid_mmap_overwrite $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
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -444,6 +450,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
+	validate_trace_path_ust_uid_snapshot "$TRACE_PATH" "" "snapshot-1" 0
 	validate_trace $EVENT_NAME $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
@@ -453,7 +460,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 
 function test_ust_local_snapshots ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test $NR_SNAPSHOT local UST snapshots"
@@ -461,7 +468,7 @@ function test_ust_local_snapshots ()
 	enable_lttng_mmap_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
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -471,6 +478,7 @@ function test_ust_local_snapshots ()
 		rm -rf $TRACE_PATH/snapshot/* 2>/dev/null
 		lttng_snapshot_record $SESSION_NAME
 		# Validate test
+		validate_trace_path_ust_uid_snapshot "$TRACE_PATH" "" "snapshot-1" $((i - 1))
 		validate_trace $EVENT_NAME $TRACE_PATH/
 		if [ $? -eq 0 ]; then
 			# Only delete if successful