Test fix: use temp file sync. of test app

[lttng-tools.git] / tests / regression / ust / periodical-metadata-flush / test_periodical_metadata_flush

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 a5950b5e33f3169a2cb0cc05a5c75925a313ba20..e836956437cff90e1dbab7447c84a054ef334c5d 100755 (executable)
--- 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
 
@@ -98,6 +99,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,16 +135,15 @@ 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
        # with validate_trace.
-       killall -q $TESTAPP_NAME
+       killall -SIGSTOP -q $TESTAPP_NAME
+
+       # Give time to the consumer to write inflight data.
        sleep 2
 
        validate_trace
@@ -128,16 +152,19 @@ test_after_app_pid() {
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
+       killall -SIGKILL -q $TESTAPP_NAME
+       wait_apps
+
        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
@@ -146,13 +173,16 @@ 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,
        # thus ensuring that we are not flushing a packet concurrently
        # with validate_trace.
-       killall -q $TESTAPP_NAME
+       killall -SIGSTOP -q $TESTAPP_NAME
+
+       # Give time to the consumer to write inflight data.
        sleep 2
 
        validate_trace
@@ -161,6 +191,7 @@ test_before_app_pid() {
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
+       killall -SIGKILL -q $TESTAPP_NAME
        wait_apps
 
        return $out
@@ -178,16 +209,15 @@ 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
        # with validate_trace.
-       killall -q $TESTAPP_NAME
+       killall -SIGSTOP -q $TESTAPP_NAME
+
+       # Give time to the consumer to write inflight data.
        sleep 2
 
        validate_trace
@@ -196,6 +226,9 @@ test_after_app_uid() {
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
+       killall -SIGKILL -q $TESTAPP_NAME
+       wait_apps
+
        return $out
 }
 
@@ -204,9 +237,8 @@ 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"
+       # Start application before tracing
+       start_trace_app
 
        create_lttng_session $SESSION_NAME $TRACE_PATH
        enable_metadata_per_uid $SESSION_NAME
@@ -214,13 +246,16 @@ 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,
        # thus ensuring that we are not flushing a packet concurrently
        # with validate_trace.
-       killall -q $TESTAPP_NAME
+       killall -SIGSTOP -q $TESTAPP_NAME
+
+       # Give time to the consumer to write inflight data.
        sleep 2
 
        validate_trace
@@ -229,6 +264,7 @@ test_before_app_uid() {
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
+       killall -SIGKILL -q $TESTAPP_NAME
        wait_apps
 
        return $out
@@ -254,7 +290,7 @@ start_lttng_sessiond
 while [ $i -lt $TEST_COUNT ]; do
        TRACE_PATH=$(mktemp -d)
        ${TESTS[$i]}
-       #rm -rf $TRACE_PATH
+       rm -rf $TRACE_PATH
        let "i++"
 done