X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=26cfbf88e9a8961a696eb128261d7d045be700c8;hb=d34e7a4dfdcaf390f17cf602d9b6e520bf9f18bc;hp=3f7ee2555d87a4ceb2640f7bc2ac5bab51a4bd45;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 3f7ee2555..26cfbf88e 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -16,27 +16,27 @@ 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)
+TRACE_PATH=$(mktemp -d -t tmp.test_snapshots_ust_trace_path.XXXXXX)
 
 source $TESTDIR/utils/utils.sh
 
 if [ ! -x "$TESTAPP_BIN" ]; then
-	BAIL_OUT "No UST events binary detected."
+	BAIL_OUT "No UST events binary detected"
 fi
 
 # Need the number of snapshot to do.
 if [ -z $1 ]; then
-	BAIL_OUT "A number of snapshot is needed."
+	BAIL_OUT "A number of snapshot is needed"
 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)
+	local tmp_file=$(mktemp -u -t "tmp.${FUNCNAME[0]}_tmp_file.XXXXXX")
 
 	# Start application with a temporary file.
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $tmp_file &
@@ -109,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"
@@ -193,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
@@ -237,9 +240,9 @@ function test_ust_local_snapshot_small_discard_buffers ()
 	rm -rf $TRACE_PATH/
 
 	if [ x"$FIRST_LINE" != x"$FIRST_LINE_2" ]; then
-		fail "First snapshot event do not match."
+		fail "First snapshot event do not match"
 	else
-		pass "First snapshot event match."
+		pass "First snapshot event match"
 	fi
 
 	stop_lttng_tracing_ok $SESSION_NAME
@@ -282,9 +285,9 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 	rm -rf $TRACE_PATH/
 
 	if [ x"$FIRST_LINE" != x"$FIRST_LINE_2" ]; then
-		pass "First snapshot event do not match."
+		pass "First snapshot event do not match"
 	else
-		fail "First snapshot event match."
+		fail "First snapshot event match"
 	fi
 
 	stop_lttng_tracing_ok $SESSION_NAME
@@ -294,52 +297,65 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 
 function test_ust_local_snapshot_max_size ()
 {
-	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))
+	local possible_cpus
+	local online_cpus
+	local subbuf_size
+	local subbuf_count
+	local snapshot_max_size
+	local channel_max_size_per_cpu
+
+	possible_cpus=$(get_possible_cpus_count)
+	online_cpus=$(conf_proc_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 $(seq "$online_cpus");
+	do
+		taskset --cpu-list $((cpu-1)) "$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
-		fail "Tracefiles size sum validation"
-		diag "Tracefiles size sum: $sum_size_tracefiles Expected max: $max_size"
-	else
+	if [ "$snapshot_size" -eq "$snapshot_max_size" ]; then
 		pass "Tracefiles size sum validation"
+	else
+		fail "Tracefiles size sum validation"
+		diag "Tracefiles size sum: $snapshot_size Expected max: $snapshot_max_size"
 	fi
 
-	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
@@ -358,13 +374,14 @@ function test_ust_local_snapshot_large_metadata ()
 	enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
-	$LM_BIN 1 1
+	$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
@@ -400,6 +417,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
@@ -430,6 +448,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
@@ -457,6 +476,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
@@ -473,6 +493,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 start_lttng_sessiond
 tests=( test_ust_list_output
 	test_ust_local_snapshot