X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_kernel;h=f6f9508ebb07b3527b7cae00d855cedcaaed394e;hp=b4c7f9146e86f02ab7d84c82c6694e40a34e48d9;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=96340a015194538227efcbc654ec02c2ed9961ce

diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel
index b4c7f9146..f6f9508eb 100755
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -19,22 +19,15 @@ TEST_DESC="Snapshots - Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="sched_switch"
-PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="snapchan"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=2040
+NUM_TESTS=2060
 
 source $TESTDIR/utils/utils.sh
 
-# LTTng kernel modules check
-out=`ls /lib/modules/$(uname -r)/extra | grep lttng`
-if [ -z "$out" ]; then
-	BAIL_OUT "LTTng modules not detected."
-fi
-
 function test_kernel_local_snapshot ()
 {
 	diag "Test local kernel snapshots"
@@ -42,10 +35,10 @@ function test_kernel_local_snapshot ()
 	enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 	lttng_snapshot_record $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
 	validate_trace $EVENT_NAME $TRACE_PATH/
@@ -65,9 +58,9 @@ function test_kernel_local_snapshot_after_stop ()
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 	lttng_snapshot_record $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
 	validate_trace $EVENT_NAME $TRACE_PATH/
@@ -89,7 +82,7 @@ function test_kernel_local_snapshot_append_to_metadata ()
 	enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT1 $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 
 	# first snapshot with only 1 event
 	lttng_snapshot_record $SESSION_NAME
@@ -115,7 +108,91 @@ function test_kernel_local_snapshot_append_to_metadata ()
 	fi
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
+}
+
+function true_loop_cpu0()
+{
+	# Generate many system call events (fill buffers) on CPU 0
+	for a in $(seq 1 $1); do
+		taskset 0x00000001 /bin/true;
+	done
+}
+
+function test_kernel_local_snapshot_discard ()
+{
+	diag "Test local kernel snapshots with small discard buffers"
+	create_lttng_session_no_output $SESSION_NAME
+	enable_lttng_mmap_discard_small_kernel_channel $SESSION_NAME \
+			$CHANNEL_NAME
+	lttng_enable_kernel_syscall_ok $SESSION_NAME -a $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
+	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+
+	true_loop_cpu0 10000
+
+	# 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
+
+	true_loop_cpu0 10000
+
+	# Take 2nd snapshot, compare first line. In discard mode, they
+	# should still be the same.
+	lttng_snapshot_record $SESSION_NAME
+	FIRST_LINE_2="$(trace_first_line $TRACE_PATH/)"
+	diag "First line (2nd snapshot): $FIRST_LINE"
+	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
+}
+
+function test_kernel_local_snapshot_overwrite_small_buffers ()
+{
+	diag "Test local kernel snapshot with small overwrite buffers"
+	create_lttng_session_no_output $SESSION_NAME
+	enable_lttng_mmap_overwrite_small_kernel_channel $SESSION_NAME \
+			$CHANNEL_NAME
+	lttng_enable_kernel_syscall_ok $SESSION_NAME -a $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
+	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+
+	true_loop_cpu0 10000
+
+	# 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
+
+	true_loop_cpu0 10000
+
+	# Take 2nd snapshot, compare first line. In overwrite mode, they
+	# WILL be different.
+	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
+		fail "First snapshot event match."
+	fi
+
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_kernel_1000_local_snapshots ()
@@ -127,7 +204,7 @@ function test_kernel_1000_local_snapshots ()
 	enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
 	for i in $(seq 1 $NB_SNAP); do
 		diag "Snapshot $i/$NB_SNAP"
 		rm -rf $TRACE_PATH/snapshot/* 2>/dev/null
@@ -142,7 +219,7 @@ function test_kernel_1000_local_snapshots ()
 		fi
 	done
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 plan_tests $NUM_TESTS
@@ -157,10 +234,19 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel snapshot tests." $NUM_TESTS ||
 {
+
+	validate_lttng_modules_present
+
 	start_lttng_sessiond
 
 	#tests=( test_kernel_1000_local_snapshots )
-	tests=( test_kernel_local_snapshot test_kernel_local_snapshot_after_stop test_kernel_local_snapshot_append_to_metadata test_kernel_1000_local_snapshots )
+	tests=( test_kernel_local_snapshot
+		test_kernel_local_snapshot_after_stop
+		test_kernel_local_snapshot_append_to_metadata
+		test_kernel_local_snapshot_discard
+		test_kernel_local_snapshot_overwrite_small_buffers
+		test_kernel_1000_local_snapshots
+	)
 
 	for fct_test in ${tests[@]};
 	do