projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deprecate enable/disable-consumer
[lttng-tools.git]
/
tests
/
tools
/
streaming
/
run-ust
diff --git
a/tests/tools/streaming/run-ust
b/tests/tools/streaming/run-ust
index 1c415cc70b44eb2f1436c6b7ce55f47b52b375b5..28b72f8245cceb27a5d34f961f7c4ae579509409 100755
(executable)
--- a/
tests/tools/streaming/run-ust
+++ b/
tests/tools/streaming/run-ust
@@
-34,16
+34,10
@@
if [ ! -x "$CURDIR/$BIN_NAME" ]; then
exit 0
fi
exit 0
fi
-function lttng_create_session
+function lttng_create_session
_uri
{
# Create session with default path
{
# Create session with default path
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME >/dev/null 2>&1
-}
-
-function lttng_enable_consumer
-{
- # Create session with default path
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-consumer -u net://localhost >/dev/null 2>&1
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
}
function wait_apps
}
function wait_apps
@@
-61,38
+55,36
@@
function wait_apps
function test_ust_before_start ()
{
echo -e "\n=== Testing UST streaming BEFORE tracing starts\n"
function test_ust_before_start ()
{
echo -e "\n=== Testing UST streaming BEFORE tracing starts\n"
- lttng_create_session
- lttng_enable_consumer
+ lttng_create_session_uri
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
# Run 5 times with a 1 second delay
./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
# Run 5 times with a 1 second delay
./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
- start_tracing $SESSION_NAME
+ start_
lttng_
tracing $SESSION_NAME
wait_apps
wait_apps
- stop_tracing $SESSION_NAME
+ stop_
lttng_
tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
}
function test_ust_after_start ()
{
echo -e "\n=== Testing UST streaming AFTER tracing starts\n"
destroy_lttng_session $SESSION_NAME
}
function test_ust_after_start ()
{
echo -e "\n=== Testing UST streaming AFTER tracing starts\n"
- lttng_create_session
- lttng_enable_consumer
+ lttng_create_session_uri
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
- start_tracing $SESSION_NAME
+ start_
lttng_
tracing $SESSION_NAME
# Run 5 times with a 1 second delay
./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
wait_apps
# Run 5 times with a 1 second delay
./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
wait_apps
- stop_tracing $SESSION_NAME
+ stop_
lttng_
tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
}
destroy_lttng_session $SESSION_NAME
}
-start_sessiond
-
lttng_start
_relayd "-o $TRACE_PATH"
+start_
lttng_
sessiond
+
start_lttng
_relayd "-o $TRACE_PATH"
tests=( test_ust_before_start test_ust_after_start )
tests=( test_ust_before_start test_ust_after_start )
@@
-112,7
+104,7
@@
do
done
echo ""
done
echo ""
-stop_sessiond
-
lttng_stop
_relayd
+stop_
lttng_
sessiond
+
stop_lttng
_relayd
exit $out
exit $out
This page took
0.024215 seconds
and
4
git commands to generate.