X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=c1d702e823c33120f96b256df93bd35044a73d8e;hb=b26c3b64ce249d0d1f8055519cd648d1a0bcc0da;hp=4fa31952cb6719a20567ae86152c3350c8377303;hpb=6afa580fbfd08a881e81ed1db788fa9fa6e01162;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 4fa31952c..c1d702e82 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -214,6 +214,27 @@ function randstring()
 	echo
 }
 
+# Return a space-separated string of online CPU IDs, based on
+# /sys/devices/system/cpu/online, or from 0 to nproc - 1 otherwise.
+function get_online_cpus()
+{
+	local cpus=()
+	local range_re
+	if [ -f /sys/devices/system/cpu/online ]; then
+		range_re='([0-9]+)-([0-9]+)'
+		while read -r range ; do
+			if [[ "${range}" =~ ${range_re} ]] ; then
+				mapfile -t -O "${#cpus[*]}" cpus <<< $(seq "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}")
+			else
+				cpus+=("${range}")
+			fi
+		done < <(tr ',' $'\n' < /sys/devices/system/cpu/online)
+	else
+		read -r -a cpus <<< $(seq 0 $(( $(conf_proc_count) - 1 )) )
+	fi
+	echo "${cpus[*]}"
+}
+
 # Helpers for get_possible_cpus.
 function get_possible_cpus_count_from_sysfs_possible_mask()
 {
@@ -286,8 +307,8 @@ function get_exposed_cpus_list()
 # value, e.g. that it could be 0.
 function get_any_available_cpu()
 {
-	for cpu in /sys/devices/system/cpu/cpu[0-9]*; do
-		echo "${cpu#/sys/devices/system/cpu/cpu}"
+	for cpu in $(get_online_cpus); do
+		echo "${cpu}"
 		break;
 	done
 }
@@ -612,7 +633,7 @@ function start_lttng_relayd_opt()
 	if [ -z $(lttng_pgrep "$RELAYD_MATCH") ]; then
 		# shellcheck disable=SC2086
 		$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $process_mode $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
-		#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
+		#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $process_mode $opt -vvv >>/tmp/relayd.log 2>&1 &
 		if [ $? -eq 1 ]; then
 			if [ $withtap -eq "1" ]; then
 				fail "Start lttng-relayd (process mode: $process_mode opt: $opt)"
@@ -654,8 +675,9 @@ function stop_lttng_relayd_opt()
 
 
 	# Multiply time by 2 to simplify integer arithmetic
+	# Multiply time by 5 to adjust for sleeping every 0.1s
 	if [ -n "$timeout_s" ]; then
-		dtimeleft_s=$((timeout_s * 2))
+		dtimeleft_s=$((timeout_s * 2 * 5))
 	fi
 
 
@@ -690,7 +712,7 @@ function stop_lttng_relayd_opt()
 				fi
 				dtimeleft_s=$((dtimeleft_s - 1))
 			fi
-			sleep 0.5
+			sleep 0.1
 		done
 		if [ "$withtap" -eq "1" ]; then
 			if [ "$retval" -eq "0" ]; then
@@ -814,8 +836,9 @@ function stop_lttng_sessiond_opt()
 	fi
 
 	# Multiply time by 2 to simplify integer arithmetic
+	# Multiply time by 5 to adjust for sleeping every 0.1s
 	if [ -n "$timeout_s" ]; then
-		dtimeleft_s=$((timeout_s * 2))
+		dtimeleft_s=$((timeout_s * 2 * 5))
 	fi
 
 	if [ -n "$TEST_NO_SESSIOND" ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
@@ -860,7 +883,7 @@ function stop_lttng_sessiond_opt()
 				fi
 				dtimeleft_s=$((dtimeleft_s - 1))
 			fi
-			sleep 0.5
+			sleep 0.1
 		done
 		out=1
 		while [ -n "$out" ]; do
@@ -872,7 +895,7 @@ function stop_lttng_sessiond_opt()
 				fi
 				dtimeleft_s=$((dtimeleft_s - 1))
 			fi
-			sleep 0.5
+			sleep 0.1
 		done
 
 		if [ "$withtap" -eq "1" ]; then
@@ -982,8 +1005,9 @@ function stop_lttng_consumerd_opt()
 	fi
 
 	# Multiply time by 2 to simplify integer arithmetic
+	# Multiply time by 5 to adjust for sleeping every 0.1s
 	if [ -n "$timeout_s" ]; then
-		dtimeleft_s=$((timeout_s * 2))
+		dtimeleft_s=$((timeout_s * 2 * 5))
 	fi
 
 	pids="$(lttng_pgrep "$CONSUMERD_MATCH")"
@@ -1028,7 +1052,7 @@ function stop_lttng_consumerd_opt()
 				fi
 				dtimeleft_s=$((dtimeleft_s - 1))
 			fi
-			sleep 0.5
+			sleep 0.1
 		done
 		if [ "$withtap" -eq "1" ]; then
 			if [ "$retval" -eq "0" ]; then
@@ -1667,9 +1691,10 @@ function destroy_lttng_session ()
 	local withtap=$1
 	local expected_to_fail=$2
 	local sess_name=$3
+	shift 3
 
 	_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
-		destroy $sess_name
+		destroy $sess_name $@
 	ret=$?
 	if [[ $expected_to_fail -eq "1" ]]; then
 		test "$ret" -ne "0"
@@ -1974,7 +1999,7 @@ function wait_live_trace_ready ()
 	diag "Waiting for live trace at url: $url"
 	while [ $zero_client_match -eq 0 ]; do
 		zero_client_match=$($BABELTRACE_BIN -i lttng-live $url | grep "0 client(s) connected" | wc -l)
-		sleep 0.5
+		sleep 0.1
 	done
 	pass "Waiting for live trace at url: $url"
 }
@@ -1987,7 +2012,7 @@ function wait_live_viewer_connect ()
 	diag "Waiting for live viewers on url: $url"
 	while [ $one_client_match -eq 0 ]; do
 		one_client_match=$($BABELTRACE_BIN -i lttng-live $url | grep "1 client(s) connected" | wc -l)
-		sleep 0.5
+		sleep 0.1
 	done
 	pass "Waiting for live viewers on url: $url"
 }