X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=78bee0c63d16f1ea14433c5b5e61724f5db45c4a;hb=198b841770f31d35afe1e50ff52e41e7599759e3;hp=196f636e68b3625731b9a16483be696345042fc0;hpb=09d8c782dbdfca9a6a67359d53fd8eb2d1eac902;p=lttng-tools.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 196f636e6..78bee0c63 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -148,7 +148,7 @@ function lttng_pgrep ()
 
 	while IFS= read -r pid ; do
 		# /proc/pid/cmdline is null separated.
-		if full_command_no_argument=$(cut -d '' -f 1 2>/dev/null < /proc/"$pid"/cmdline); then
+		if full_command_no_argument=$(tr '\0' '\n' < /proc/"$pid"/cmdline 2>/dev/null | head -n1); then
 			command_basename=$(basename "$full_command_no_argument")
 			if grep -q "$pattern" <<< "$command_basename"; then
 				echo "$pid"
@@ -204,11 +204,48 @@ function validate_kernel_version ()
 #  $2 = include special characters; 1 = yes, 0 = no; defaults to yes
 function randstring()
 {
+	local len="${1:-16}"
+
 	[ "$2" == "0" ] && CHAR="[:alnum:]" || CHAR="[:graph:]"
-	cat /dev/urandom 2>/dev/null | tr -cd "$CHAR" 2>/dev/null | head -c ${1:-16} 2>/dev/null
+	# /dev/urandom isn't guaranteed to generate valid multi-byte characters.
+	# Specifying the C locale eliminates the "Illegal byte sequence" error
+	# that 'tr' outputs in such cases.
+	LC_CTYPE=C tr -cd "$CHAR" < /dev/urandom 2>/dev/null | head -c "$len" 2>/dev/null
 	echo
 }
 
+# Helpers for get_possible_cpus.
+function get_possible_cpus_count_from_sysfs_possible_mask()
+{
+	local max_possible_cpu_id=$(cut -d '-' -f 2 < /sys/devices/system/cpu/possible)
+	echo $((max_possible_cpu_id+1))
+}
+
+function get_max_cpus_count_from_sysfs_cpu_directories()
+{
+	local max_possible_cpu_id= \
+		$(find /sys/devices/system/cpu/ -mindepth 1 -maxdepth 1 -regex ".+cpu[0-9]+" | \
+		  sed -e 's/cpu//g' | \
+		  awk -F '/' '{ if ($NF > N) N = $NF } END { print N }')
+	echo $((max_possible_cpu_id+1))
+}
+
+# Return the number of possible CPUs.
+function get_possible_cpus_count()
+{
+	local possible_cpus_count=$(get_possible_cpus_count_from_sysfs_possible_mask)
+
+	if [ $? -ne 0 ]; then
+		possible_cpus_count=$(get_max_cpus_count_from_sysfs_cpu_directories)
+		local configured_cpus_count=$(getconf _NPROCESSORS_CONF)
+		possible_cpus_count=$(($configured_cpus_count > $possible_cpus_count \
+							      ? $configured_cpus_count \
+							      : $possible_cpus_count))
+	fi
+
+	echo $possible_cpus_count
+}
+
 # Return the number of _configured_ CPUs.
 function conf_proc_count()
 {
@@ -2371,8 +2408,8 @@ function lttng_remove_trigger_ok()
 
 function list_triggers_matches_ok ()
 {
-	local tmp_stdout=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
-	local tmp_stderr=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
+	local tmp_stdout=$(mktemp -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	local tmp_stderr=$(mktemp -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
 
 	local test_name="$1"
 	local expected_stdout_file="$2"
@@ -2401,9 +2438,9 @@ function list_triggers_matches_mi_ok ()
 	local test_name="$1"
 	local expected_stdout_file="$2"
 
-	tmp_stdout_raw=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
-	tmp_stdout=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
-	tmp_stderr=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
+	tmp_stdout_raw=$(mktemp -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	tmp_stdout=$(mktemp -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	tmp_stderr=$(mktemp -t "tmp.${FUNCNAME[0]}_stderr.XXXXXX")
 
 	diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi xml list-triggers"