CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
EVENT_NAME="tp:tptest"
-PID_RELAYD=0
SESSION_NAME=""
CHANNEL_NAME="chan1"
BIN_NAME="gen-nevents"
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-NR_ITER=2000000
+NR_ITER=-1
NR_USEC_WAIT=100
APPS_PID=
TRACE_PATH=$(mktemp -d)
-NUM_TESTS=49
+NUM_TESTS=75
source $TESTDIR/utils/utils.sh
create_lttng_session_no_output $SESSION_NAME
enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing_ok $SESSION_NAME
start_test_app
lttng_snapshot_record $SESSION_NAME
# Validate test
- echo $TRACE_PATH/$HOSTNAME/snapshot-1
- validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+ validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
if [ $? -ne 0 ]; then
stop_test_apps
return $?
fi
- lttng_snapshot_del_output $SESSION_NAME 1
+ lttng_snapshot_del_output_ok $SESSION_NAME 1
snapshot_add_output $SESSION_NAME "net://localhost"
lttng_snapshot_record $SESSION_NAME
# Validate test with the next ID since a del output was done prior.
- validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-2*
+ validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-2*
if [ $? -ne 0 ]; then
stop_test_apps
return $?
fi
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
stop_test_apps
create_lttng_session_no_output $SESSION_NAME
enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing_ok $SESSION_NAME
start_test_app
snapshot_add_output $SESSION_NAME "net://localhost"
lttng_snapshot_record $SESSION_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
# Validate test
- validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+ validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
out=$?
stop_test_apps
create_lttng_session_no_output $SESSION_NAME
enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing_ok $SESSION_NAME
start_test_app
snapshot_add_output $SESSION_NAME "-C tcp://localhost:5342 -D tcp://localhost:5343"
lttng_snapshot_record $SESSION_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
# Validate test
- validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+ validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
out=$?
stop_test_apps
create_lttng_session_no_output $SESSION_NAME
enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing_ok $SESSION_NAME
start_test_app
snapshot_add_output $SESSION_NAME "net://localhost" $name
lttng_snapshot_record $SESSION_NAME
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
- if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
+ if ls $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name* &> /dev/null; then
ok 0 "Custom name snapshot exists"
# Validate test
- validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$name-*
+ validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/$name-*
out=$?
else
fail "No custom name snapshot found"
return $out
}
+function test_ust_n_snapshot()
+{
+ diag "Test ust snapshot streaming multiple consecutive snapshot"
+ create_lttng_session_no_output $SESSION_NAME
+ enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
+ enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+ snapshot_add_output $SESSION_NAME "net://localhost" $name
+ start_test_app
+ for i in {1..5};
+ do
+ start_lttng_tracing_ok $SESSION_NAME
+ lttng_snapshot_record $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
+ validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*/snapshot-1*
+ if [ $? -ne 0 ]; then
+ return 1
+ fi
+ set -u
+ rm -rf $TRACE_PATH/$HOSTNAME
+ set +u
+ done
+
+ destroy_lttng_session_ok $SESSION_NAME
+ stop_test_apps
+ return 0
+}
+
plan_tests $NUM_TESTS
print_test_banner "$TEST_DESC"
start_lttng_relayd "-o $TRACE_PATH"
start_lttng_sessiond
-tests=( test_ust_default_name_with_del test_ust_default_name test_ust_custom_name test_ust_default_name_custom_uri )
+tests=( test_ust_default_name_with_del
+ test_ust_default_name
+ test_ust_custom_name
+ test_ust_default_name_custom_uri
+ test_ust_n_snapshot
+)
for fct_test in ${tests[@]};
do