X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fperiodical-metadata-flush%2Ftest_periodical_metadata_flush;h=e4199652bce1a456333ca0d88cbe869a5b590f96;hb=94dab75b56f0bcfa8389c6befe3d4be3fbb3c75e;hp=ad9d33d521ddbbdb022040df5599f9a539777a12;hpb=8a251cb8ade9db2f560604fa53b3515ca0d60c22;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 ad9d33d52..e4199652b 100755
--- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@ -27,6 +27,7 @@ SESSION_NAME="periodical-flush"
 EVENT_NAME="tp:tptest"
 BIN_NAME="gen-nevents"
 NUM_TESTS=38
+APP_TMP_FILE="/tmp/lttng_test_ust.42.file"
 
 source $TESTDIR/utils/utils.sh
 
@@ -72,14 +73,6 @@ function enable_metadata_per_pid()
 	ok $? "Enable channel $channel_name per PID for session $sess_name"
 }
 
-function wait_apps
-{
-	diag "Waiting for applications to end..."
-	while [ -n "$(pidof $TESTAPP_NAME)" ]; do
-		sleep 1
-	done
-}
-
 function validate_trace()
 {
 	local out
@@ -98,6 +91,30 @@ function validate_trace()
 	return $out
 }
 
+function check_app_tmp_file()
+{
+	# Wait for the application file to appear indicating that at least one
+	# tracepoint has been fired.
+	while [ ! -f "$APP_TMP_FILE" ]; do
+		sleep 0.5
+	done
+	diag "Removing test app temporary file $APP_TMP_FILE"
+	rm -f $APP_TMP_FILE
+}
+
+function start_trace_app()
+{
+	# Start application with a temporary file.
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $APP_TMP_FILE &
+	ok $? "Start application to trace"
+}
+
+function start_check_trace_app()
+{
+	start_trace_app
+	check_app_tmp_file
+}
+
 test_after_app_pid() {
 	local out
 
@@ -110,11 +127,8 @@ test_after_app_pid() {
 	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
+	start_check_trace_app
+	# After this point we are sure that at least one event has been hit.
 
 	# Make sure the application does not generate any more data,
 	# thus ensuring that we are not flushing a packet concurrently
@@ -127,22 +141,22 @@ test_after_app_pid() {
 	validate_trace
 	out=$?
 
+	killall -SIGKILL -q $TESTAPP_NAME
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
-	killall -SIGKILL -q $TESTAPP_NAME
-	wait_apps
+	wait
 
 	return $out
 }
 
 test_before_app_pid() {
 	local out
+	local tmp_file="/tmp/lttng_test_ust.42.file"
 
 	diag "Start application BEFORE tracing is started"
 
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-	ok $? "Start application to trace"
+	start_trace_app
 
 	# Start application before tracing
 	create_lttng_session $SESSION_NAME $TRACE_PATH
@@ -151,7 +165,8 @@ test_before_app_pid() {
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
 	start_lttng_tracing $SESSION_NAME
 
-	# At least hit one event
+	check_app_tmp_file
+	# Let the application at least perform a flush!
 	sleep 2
 
 	# Make sure the application does not generate any more data,
@@ -165,11 +180,11 @@ test_before_app_pid() {
 	validate_trace
 	out=$?
 
+	killall -SIGKILL -q $TESTAPP_NAME
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
-	killall -SIGKILL -q $TESTAPP_NAME
-	wait_apps
+	wait
 
 	return $out
 }
@@ -186,11 +201,8 @@ test_after_app_uid() {
 	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
+	start_check_trace_app
+	# After this point we are sure that at least one event has been hit.
 
 	# Make sure the application does not generate any more data,
 	# thus ensuring that we are not flushing a packet concurrently
@@ -203,11 +215,11 @@ test_after_app_uid() {
 	validate_trace
 	out=$?
 
+	killall -SIGKILL -q $TESTAPP_NAME
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
-	killall -SIGKILL -q $TESTAPP_NAME
-	wait_apps
+	wait
 
 	return $out
 }
@@ -218,8 +230,7 @@ test_before_app_uid() {
 	diag "Start application BEFORE tracing is started"
 
 	# Start application before tracing
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-	ok $? "Start application to trace"
+	start_trace_app
 
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_uid $SESSION_NAME
@@ -227,7 +238,8 @@ test_before_app_uid() {
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
 	start_lttng_tracing $SESSION_NAME
 
-	# At least hit one event
+	check_app_tmp_file
+	# Let the application at least perform a flush!
 	sleep 2
 
 	# Make sure the application does not generate any more data,
@@ -241,11 +253,11 @@ test_before_app_uid() {
 	validate_trace
 	out=$?
 
+	killall -SIGKILL -q $TESTAPP_NAME
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
-	killall -SIGKILL -q $TESTAPP_NAME
-	wait_apps
+	wait
 
 	return $out
 }