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()
{
# 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
}
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)"
# 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
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.5
+ sleep 0.1
done
if [ "$withtap" -eq "1" ]; then
if [ "$retval" -eq "0" ]; then
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
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.5
+ sleep 0.1
done
out=1
while [ -n "$out" ]; do
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.5
+ sleep 0.1
done
if [ "$withtap" -eq "1" ]; then
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")"
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.5
+ sleep 0.1
done
if [ "$withtap" -eq "1" ]; then
if [ "$retval" -eq "0" ]; then
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"
}
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"
}