X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fperiodical-metadata-flush%2Ftest_periodical_metadata_flush;h=a5950b5e33f3169a2cb0cc05a5c75925a313ba20;hb=df8178078e1edef5bcdf650547fc70be7936f33a;hp=efb9e6690a90fc3721f6e3c59747a91ae6fbeb64;hpb=1afc6e74058a84eae11c61e6ffc8ffb45472d580;p=lttng-tools.git

diff --git a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
index efb9e6690..a5950b5e3 100755
--- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@ -41,7 +41,7 @@ function enable_channel_per_uid()
 	local sess_name=$1
 	local channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 1000000 >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
@@ -50,7 +50,7 @@ function enable_channel_per_pid()
 	local sess_name=$1
 	local channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 1000000 >/dev/null 2>&1
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
@@ -103,18 +103,25 @@ test_after_app_pid() {
 
 	diag "Start application AFTER tracing is started"
 
-	# BEFORE application is spawned
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_pid $SESSION_NAME
 	enable_channel_per_pid $SESSION_NAME "channel0"
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
 	start_lttng_tracing $SESSION_NAME
 
+	# Start application after tracing
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
 	ok $? "Start application to trace"
 
 	# At least hit one event
 	sleep 2
+
+	# Make sure the application does not generate any more data,
+	# thus ensuring that we are not flushing a packet concurrently
+	# with validate_trace.
+	killall -q $TESTAPP_NAME
+	sleep 2
+
 	validate_trace
 	out=$?
 
@@ -132,15 +139,22 @@ test_before_app_pid() {
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
 	ok $? "Start application to trace"
 
-	# BEFORE application is spawned
+	# Start application before tracing
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_pid $SESSION_NAME
 	enable_channel_per_pid $SESSION_NAME "channel0"
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
 	start_lttng_tracing $SESSION_NAME
 
 	# At least hit one event
 	sleep 2
+
+	# Make sure the application does not generate any more data,
+	# thus ensuring that we are not flushing a packet concurrently
+	# with validate_trace.
+	killall -q $TESTAPP_NAME
+	sleep 2
+
 	validate_trace
 	out=$?
 
@@ -157,18 +171,25 @@ test_after_app_uid() {
 
 	diag "Start application AFTER tracing is started"
 
-	# BEFORE application is spawned
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_uid $SESSION_NAME
 	enable_channel_per_uid $SESSION_NAME "channel0"
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
 	start_lttng_tracing $SESSION_NAME
 
+	# Start application after tracing
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
 	ok $? "Start application to trace"
 
 	# At least hit one event
 	sleep 2
+
+	# Make sure the application does not generate any more data,
+	# thus ensuring that we are not flushing a packet concurrently
+	# with validate_trace.
+	killall -q $TESTAPP_NAME
+	sleep 2
+
 	validate_trace
 	out=$?
 
@@ -183,10 +204,10 @@ test_before_app_uid() {
 
 	diag "Start application BEFORE tracing is started"
 
+	# Start application after tracing
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
 	ok $? "Start application to trace"
 
-	# BEFORE application is spawned
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_uid $SESSION_NAME
 	enable_channel_per_uid $SESSION_NAME "channel0"
@@ -195,6 +216,13 @@ test_before_app_uid() {
 
 	# At least hit one event
 	sleep 2
+
+	# Make sure the application does not generate any more data,
+	# thus ensuring that we are not flushing a packet concurrently
+	# with validate_trace.
+	killall -q $TESTAPP_NAME
+	sleep 2
+
 	validate_trace
 	out=$?