X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Futil_event_generator.sh;h=bac089086444c7453301f65a8337c131c6f4067c;hp=55189cf7cec217e88b7f2d3d5c364a79666aaff9;hb=2a05e025c52eda43f8ebafdbe6f47dc0e80efa77;hpb=3bfde48aceec7b73b8fe74e5c75fad0f795e67d6 diff --git a/tests/regression/tools/notification/util_event_generator.sh b/tests/regression/tools/notification/util_event_generator.sh index 55189cf7c..bac089086 100644 --- a/tests/regression/tools/notification/util_event_generator.sh +++ b/tests/regression/tools/notification/util_event_generator.sh @@ -14,6 +14,9 @@ SYSCALL_TESTAPP_BIN=${SYSCALL_TESTAPP_BIN:-"$TESTAPP_PATH/$SYSCALL_TESTAPP_NAME/ USERSPACE_PROBE_ELF_TESTAPP_NAME=${USERSPACE_PROBE_ELF_TESTAPP_NAME:-"userspace-probe-elf-binary"} USERSPACE_PROBE_ELF_TESTAPP_BIN=${USERSPACE_PROBE_ELF_TESTAPP_BIN:-"$TESTAPP_PATH/$USERSPACE_PROBE_ELF_TESTAPP_NAME/.libs/$USERSPACE_PROBE_ELF_TESTAPP_NAME"} +# shellcheck source=../utils/utils.sh +source "$GENERATOR_TESTDIR/utils/utils.sh" + function generate_filter_events { local nr=$1 @@ -25,7 +28,7 @@ function generate_syscalls local nr=$1 shift - for i in $(seq 1 "$nr"); do + for _ in $(seq 1 "$nr"); do # Pass /dev/null so to generate the syscall right away. $SYSCALL_TESTAPP_BIN /dev/null "$@" done @@ -36,7 +39,7 @@ function userspace_probe_testapp local nr=$1 shift - for i in $(seq 1 "$nr"); do + for _ in $(seq 1 "$nr"); do # This userspace probe test has to instrument the actual elf # binary and not the generated libtool wrapper. However, we # can't invoke the wrapper either since it will re-link the test @@ -90,7 +93,7 @@ function ust_event_generator_run_once_per_transition run=true sleep 0.5 elif [ "$run" = true ]; then - taskset -c 0 "$test_app" -i "$nr_iter" -w "$nr_usec_wait" "$@"> /dev/null 2>&1 + taskset -c "$(get_any_available_cpu)" "$test_app" -i "$nr_iter" -w "$nr_usec_wait" "$@"> /dev/null 2>&1 run=false; if [[ -f $state_file ]]; then rm -rf "$state_file" 2> /dev/null @@ -127,7 +130,7 @@ function ust_event_generator # Reset the "run" state sleep 0.5 else - taskset -c 0 "$test_app" -i $nr_iter -w $nr_usec_wait "$@" > /dev/null 2>&1 + taskset -c "$(get_any_available_cpu)" "$test_app" -i $nr_iter -w $nr_usec_wait "$@" > /dev/null 2>&1 if [[ -f $state_file ]]; then rm -rf "$state_file" 2> /dev/null fi