Decrease the switch timer period to 100ms (instead of 1s), since we're
only getting 2s worth of app run. If the system is busy, nothing really
guarantee that the timer will indeed fire during this time-frame (so
strictly speaking, this test could still fail).
Also, kill the application before trying to read the trace: this should
ensure that the trace is not appended to concurrently with validation.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
local sess_name=$1
local channel_name=$2
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"
}
ok $? "Enable channel $channel_name per UID for session $sess_name"
}
local sess_name=$1
local channel_name=$2
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"
}
ok $? "Enable channel $channel_name per UID for session $sess_name"
}
diag "Start application AFTER tracing is started"
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 "channel0"
start_lttng_tracing $SESSION_NAME
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 "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
$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
+
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
ok $? "Start application to trace"
$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"
create_lttng_session $SESSION_NAME $TRACE_PATH
enable_metadata_per_pid $SESSION_NAME
enable_channel_per_pid $SESSION_NAME "channel0"
# At least hit one event
sleep 2
# 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
+
diag "Start application AFTER tracing is started"
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
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
$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
+
diag "Start application BEFORE tracing is started"
diag "Start application BEFORE tracing is started"
+ # Start application after tracing
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
ok $? "Start application to trace"
$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"
create_lttng_session $SESSION_NAME $TRACE_PATH
enable_metadata_per_uid $SESSION_NAME
enable_channel_per_uid $SESSION_NAME "channel0"
# At least hit one event
sleep 2
# 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
+