X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fstress%2Ftest_multi_sessions_per_uid_5app_streaming_kill_relayd;h=c699ac226d54ac8c486b977b4dab5edd5c8d3c89;hb=81684730b3134c61ca310bf26733c01d783103d7;hp=e01e6aaf8c80906a019680e5f520bc42a4c14245;hpb=7e635e711c37b1cf813a52babfe449e3863517f4;p=lttng-tools.git

diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
index e01e6aaf8..c699ac226 100755
--- a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
+++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd
@@ -41,18 +41,9 @@ function enable_channel_per_uid()
     ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
-function lttng_create_session_uri
-{
-	local name=$1
-
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $name -U net://localhost >/dev/null 2>&1
-	ok $? "Create session on net://localhost"
-}
-
 function check_sessiond()
 {
-	if [ -z "$(pidof lt-lttng-sessiond)" ]; then
+	if [ -z "$(pgrep --full lt-lttng-sessiond)" ]; then
 		local str_date=$(date +%H%M%S-%d%m%Y)
 
 		diag "!!!The session daemon died unexpectedly!!!"
@@ -66,15 +57,13 @@ function check_sessiond()
 
 function start_sessiond()
 {
-	local SESSIOND_BIN="lttng-sessiond"
-
 	validate_kernel_version
 	if [ $? -ne 0 ]; then
 		fail "Start session daemon"
 		BAIL_OUT "*** Kernel too old for session daemon tests ***"
 	fi
 
-	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+	if [ -z $(pgrep --full lt-$SESSIOND_BIN) ]; then
 		# We have to start it like this so the ulimit -c is used by this
 		# process. Also, we collect any error message printed out.
 		#$TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --quiet --background --consumerd32-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$TESTDIR/../src/bin/lttng-consumerd/lttng-consumerd" >$LOG_FILE_SESSIOND 2>&1
@@ -88,9 +77,8 @@ function start_sessiond()
 function start_relayd
 {
 	local opt=$1
-	local RELAYD_BIN="lttng-relayd"
 
-	if [ -z $(pidof lt-$RELAYD_BIN) ]; then
+	if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
 		$TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 &
 		ok $? "Start lttng-relayd (opt: \"$opt\")"
 	fi
@@ -98,7 +86,7 @@ function start_relayd
 
 function check_relayd()
 {
-	if [ -z "$(pidof lt-lttng-relayd)" ]; then
+	if [ -z "$(pgrep --full lt-lttng-relayd)" ]; then
 		local str_date=$(date +%H%M%S-%d%m%Y)
 
 		#diag "Relay daemon died. Starting it again"
@@ -113,25 +101,25 @@ test_stress()
 {
 	for b in $(seq 1 $NR_LOOP); do
 		for a in $(seq 1 $NR_SESSION); do
-			lttng_create_session_uri $SESSION_NAME-$a
+			create_lttng_session_uri $SESSION_NAME-$a net://localhost
 			check_sessiond
 			check_relayd
 			enable_channel_per_uid $SESSION_NAME-$a $CHANNEL_NAME
 			check_sessiond
 			check_relayd
-			enable_ust_lttng_event $SESSION_NAME-$a $EVENT_NAME
+			enable_ust_lttng_event_ok $SESSION_NAME-$a $EVENT_NAME
 			check_sessiond
 			check_relayd
-			start_lttng_tracing $SESSION_NAME-$a
+			start_lttng_tracing_ok $SESSION_NAME-$a
 			check_sessiond
 			check_relayd
 		done
 
 		for a in $(seq 1 $NR_SESSION); do
-			stop_lttng_tracing $SESSION_NAME-$a
+			stop_lttng_tracing_ok $SESSION_NAME-$a
 			check_sessiond
 			check_relayd
-			destroy_lttng_session $SESSION_NAME-$a
+			destroy_lttng_session_ok $SESSION_NAME-$a
 			check_sessiond
 			check_relayd
 		done