projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: live_test regression on large number of cpus
[lttng-tools.git]
/
tests
/
regression
/
tools
/
snapshots
/
ust_test
diff --git
a/tests/regression/tools/snapshots/ust_test
b/tests/regression/tools/snapshots/ust_test
index e727aa6349f5075fcf04531374af08b9092c9571..e839b84bfa364590e8fb054cbf3791939b3587bb 100755
(executable)
--- a/
tests/regression/tools/snapshots/ust_test
+++ b/
tests/regression/tools/snapshots/ust_test
@@
-27,6
+27,7
@@
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
NR_ITER=2000000
NR_USEC_WAIT=100
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
NR_ITER=2000000
NR_USEC_WAIT=100
+APPS_PID=
NUM_TESTS=76
NUM_TESTS=76
@@
-48,11
+49,13
@@
NUM_TESTS=$(($NUM_TESTS + ($NR_SNAPSHOT * 2)))
function start_test_app()
{
function start_test_app()
{
- local tmp_file=
"/tmp/lttng_test_ust.42.file"
+ local tmp_file=
$(mktemp -u)
# Start application with a temporary file.
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
# Start application with a temporary file.
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
- ok $? "Start application to trace"
+ ret=$?
+ APPS_PID="${APPS_PID} ${!}"
+ ok $ret "Start application to trace"
# Wait for the application file to appear indicating that at least one
# tracepoint has been fired.
# Wait for the application file to appear indicating that at least one
# tracepoint has been fired.
@@
-63,11
+66,14
@@
function start_test_app()
rm -f $tmp_file
}
rm -f $tmp_file
}
-function
kill_test_app
()
+function
stop_test_apps
()
{
{
- diag "Killing $TESTAPP_NAME"
- PID_APP=`pidof $TESTAPP_NAME`
- kill $PID_APP >/dev/null 2>&1
+ diag "Stopping $TESTAPP_NAME"
+ for p in ${APPS_PID}; do
+ kill ${p}
+ wait ${p} 2>/dev/null
+ done
+ APPS_PID=
}
function snapshot_add_output ()
}
function snapshot_add_output ()
@@
-168,11
+174,9
@@
function test_ust_local_snapshot ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
fi
- kill_test_app
+ stop_test_apps
}
function test_ust_local_snapshot_max_size ()
}
function test_ust_local_snapshot_max_size ()
@@
-220,7
+224,7
@@
function test_ust_local_snapshot_max_size ()
rm -rf $TRACE_PATH
fi
rm -rf $TRACE_PATH
fi
- kill_test_app
+ stop_test_apps
}
function test_ust_local_snapshot_large_metadata ()
}
function test_ust_local_snapshot_large_metadata ()
@@
-247,8
+251,6
@@
function test_ust_local_snapshot_large_metadata ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
}
fi
}
@@
-282,11
+284,9
@@
function test_ust_per_uid_local_snapshot ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
fi
- kill_test_app
+ stop_test_apps
}
function test_ust_per_uid_local_snapshot_post_mortem ()
}
function test_ust_per_uid_local_snapshot_post_mortem ()
@@
-300,7
+300,7
@@
function test_ust_per_uid_local_snapshot_post_mortem ()
# Returns once the application has at least fired ONE tracepoint.
start_test_app
# Returns once the application has at least fired ONE tracepoint.
start_test_app
- kill_test_app
+ stop_test_apps
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
@@
-311,8
+311,6
@@
function test_ust_per_uid_local_snapshot_post_mortem ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
}
fi
}
@@
-337,14
+335,12
@@
function test_ust_local_snapshots ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
done
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
fi
done
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
- kill_test_app
+ stop_test_apps
}
plan_tests $NUM_TESTS
}
plan_tests $NUM_TESTS
This page took
0.02481 seconds
and
4
git commands to generate.