X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_ust;h=c88e98a2d6e07168d666754e27ab7a77f76b9964;hp=1e24411aa22eb0ff070e8f6f1f847a8de35ad8ee;hb=7f12ef5d1b1de751b90c2e88fa331692a998ed70;hpb=ebaaaf5e2dd16fc390337d86faa089707fdd152e

diff --git a/tests/regression/tools/snapshots/test_ust b/tests/regression/tools/snapshots/test_ust
index 1e24411aa..c88e98a2d 100755
--- a/tests/regression/tools/snapshots/test_ust
+++ b/tests/regression/tools/snapshots/test_ust
@@ -19,7 +19,6 @@ TEST_DESC="Snapshots - UST tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="tp:tptest"
-BIN_NAME="gen-nevents"
 PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="snapchan"
@@ -31,7 +30,7 @@ NR_USEC_WAIT=100
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=2019
+NUM_TESTS=2053
 
 source $TESTDIR/utils/utils.sh
 
@@ -66,6 +65,98 @@ function test_ust_local_snapshot ()
 	kill $PID_APP >/dev/null 2>&1
 }
 
+function test_ust_local_snapshot_large_metadata ()
+{
+	LM_EVENT="tp:tptest1,tp:tptest2,tp:tptest3,tp:tptest4,tp:tptest5"
+	LM_PATH="$TESTDIR/utils/testapp"
+	LM_NAME="gen-ust-nevents"
+	LM_BIN="$LM_PATH/$LM_NAME/$LM_NAME"
+
+	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
+	$LM_BIN 1 1
+	ok $? "Start application to trace"
+	lttng_snapshot_record $SESSION_NAME
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $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
+}
+
+function enable_channel_per_uid_mmap_overwrite()
+{
+	sess_name=$1
+	channel_name=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --output mmap --overwrite >/dev/null 2>&1
+	ok $? "Enable channel $channel_name per UID for session $sess_name"
+}
+
+function test_ust_per_uid_local_snapshot ()
+{
+	diag "Test 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
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+	ok $? "Start application to trace"
+	lttng_snapshot_record $SESSION_NAME
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $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
+	diag "Killing $TESTAPP_NAME"
+	PID_APP=`pidof $TESTAPP_NAME`
+	kill $PID_APP >/dev/null 2>&1
+}
+
+function test_ust_per_uid_local_snapshot_post_mortem ()
+{
+	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
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+	ok $? "Start application to trace"
+	diag "Killing $TESTAPP_NAME"
+	PID_APP=`pidof $TESTAPP_NAME`
+	kill $PID_APP >/dev/null 2>&1
+	lttng_snapshot_record $SESSION_NAME
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $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_1000_local_snapshots ()
 {
 	NB_SNAP=1000
@@ -94,7 +185,7 @@ function test_ust_1000_local_snapshots ()
 	destroy_lttng_session $SESSION_NAME
 	diag "Killing $TESTAPP_NAME"
 	PID_APP=`pidof $TESTAPP_NAME`
-#	kill $PID_APP >/dev/null 2>&1
+	kill $PID_APP >/dev/null 2>&1
 }
 
 plan_tests $NUM_TESTS
@@ -109,7 +200,11 @@ fi
 
 start_lttng_sessiond
 
-tests=( test_ust_local_snapshot test_ust_1000_local_snapshots )
+tests=( test_ust_local_snapshot \
+	test_ust_per_uid_local_snapshot \
+	test_ust_per_uid_local_snapshot_post_mortem \
+	test_ust_local_snapshot_large_metadata \
+	test_ust_1000_local_snapshots )
 
 for fct_test in ${tests[@]};
 do