X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=4ee3dda8720428c9ab36c65ba9065d0bd25b8d66;hp=d08d6b23cf3164476975e2959172a48cd106f7aa;hb=fd7fe1a8c1960a83f49d1376cd69cf5972dcff3b;hpb=34ab15c5ca50f09421deca33d1bc5218a0ac00b3

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index d08d6b23c..4ee3dda87 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -33,6 +33,12 @@ KERNEL_PATCHLEVEL_VERSION=27
 # systems. Specialized tests should test those corner-cases.
 export LTTNG_UST_REGISTER_TIMEOUT=-1
 
+# We set the default lttng-sessiond path to /bin/true to prevent the spawning
+# of a daemonized sessiond. This is necessary since 'lttng create' will spawn
+# its own sessiond if none is running. It also ensures that 'lttng create'
+# fails when no sessiond is running.
+export LTTNG_SESSIOND_PATH="/bin/true"
+
 source $TESTDIR/utils/tap/tap.sh
 
 function print_ok ()
@@ -86,6 +92,16 @@ function randstring()
 	echo
 }
 
+# Return the number of _configured_ CPUs.
+function conf_proc_count()
+{
+	getconf _NPROCESSORS_CONF
+	if [ $? -ne 0 ]; then
+		diag "Failed to get the number of configured CPUs"
+	fi
+	echo
+}
+
 function enable_kernel_lttng_event
 {
 	local expected_to_fail="$1"
@@ -269,7 +285,7 @@ function start_lttng_relayd_opt()
 
 	DIR=$(readlink -f $TESTDIR)
 
-	if [ -z $(pidof lt-$RELAYD_BIN) ]; then
+	if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
 		$DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
 		#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
 		if [ $? -eq 1 ]; then
@@ -301,7 +317,7 @@ function stop_lttng_relayd_opt()
 {
 	local withtap=$1
 
-	PID_RELAYD=`pidof lt-$RELAYD_BIN`
+	PID_RELAYD=`pgrep --full lt-$RELAYD_BIN`
 
 	if [ $withtap -eq "1" ]; then
 		diag "Killing lttng-relayd (pid: $PID_RELAYD)"
@@ -317,7 +333,7 @@ function stop_lttng_relayd_opt()
 	else
 		out=1
 		while [ -n "$out" ]; do
-			out=$(pidof lt-$RELAYD_BIN)
+			out=$(pgrep --full lt-$RELAYD_BIN)
 			sleep 0.5
 		done
 		if [ $withtap -eq "1" ]; then
@@ -359,10 +375,10 @@ function start_lttng_sessiond_opt()
 	: ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
 	export LTTNG_SESSION_CONFIG_XSD_PATH
 
-	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+	if [ -z $(pgrep --full lt-$SESSIOND_BIN) ]; then
 		# Have a load path ?
 		if [ -n "$load_path" ]; then
-			$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$1" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+			$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
 		else
 			$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
 		fi
@@ -395,7 +411,7 @@ function stop_lttng_sessiond_opt()
 		return
 	fi
 
-	PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
+	PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN`
 
 	if [ -n "$2" ]; then
 		kill_opt="$kill_opt -s $signal"
@@ -410,12 +426,12 @@ function stop_lttng_sessiond_opt()
 	else
 		out=1
 		while [ -n "$out" ]; do
-			out=$(pidof lt-$SESSIOND_BIN)
+			out=$(pgrep --full lt-$SESSIOND_BIN)
 			sleep 0.5
 		done
 		out=1
 		while [ -n "$out" ]; do
-			out=$(pidof $CONSUMERD_BIN)
+			out=$(pgrep --full $CONSUMERD_BIN)
 			sleep 0.5
 		done
 		if [ $withtap -eq "1" ]; then
@@ -440,7 +456,7 @@ function stop_lttng_consumerd_opt()
 	local signal=$2
 	local kill_opt=""
 
-	PID_CONSUMERD=`pidof $CONSUMERD_BIN`
+	PID_CONSUMERD=`pgrep --full $CONSUMERD_BIN`
 
 	if [ -n "$2" ]; then
 		kill_opt="$kill_opt -s $signal"
@@ -461,7 +477,7 @@ function stop_lttng_consumerd_opt()
 	else
 		out=1
 		while [ $out -ne 0 ]; do
-			pid=$(pidof $CONSUMERD_BIN)
+			pid=$(pgrep --full $CONSUMERD_BIN)
 
 			# If consumerds are still present check their status.
 			# A zombie status qualifies the consumerd as *killed*