[PATCH stalld 31/52] tests: Reduce timing and replace sleeps with event waits
Wander Lairson Costa <[email protected]> Mon, 8 Jun 2026 15:31:41 -0300
| Newsgroups | org.kernel.vger.linux-rt-users |
|---|---|
| Message-ID | <[email protected]> |
Lower starvation thresholds, reduce starvation_gen durations, and replace fixed sleep delays with process-wait and event-driven synchronization in the functional tests. This reduces test suite runtime without sacrificing reliability. Signed-off-by: Wander Lairson Costa <[email protected]> --- tests/functional/test_deadline_boosting.sh | 2 +- tests/functional/test_fifo_boosting.sh | 2 +- tests/functional/test_fifo_priority_starvation.sh | 5 +++-- tests/functional/test_idle_detection.sh | 2 +- tests/functional/test_starvation_detection.sh | 3 ++- tests/functional/test_starvation_threshold.sh | 5 +---- tests/functional/test_task_merging.sh | 9 ++++----- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/tests/functional/test_deadline_boosting.sh b/tests/functional/test_deadline_boosting.sh index 305c641..25d0f0e 100755 --- a/tests/functional/test_deadline_boosting.sh +++ b/tests/functional/test_deadline_boosting.sh @@ -30,7 +30,7 @@ log "Starting stalld with ${threshold}s threshold (default DEADLINE boosting)" start_stalld_with_log "${STALLD_LOG}" -f -v -g 1 -t $threshold -c ${TEST_CPU} -a ${STALLD_CPU} # Create starvation -starvation_duration=$((threshold + 8)) +starvation_duration=$((threshold + 5)) log "Creating starvation on CPU ${TEST_CPU} for ${starvation_duration}s" start_starvation_gen -c ${TEST_CPU} -p 80 -n 2 -d ${starvation_duration} diff --git a/tests/functional/test_fifo_boosting.sh b/tests/functional/test_fifo_boosting.sh index 57c473d..e489950 100755 --- a/tests/functional/test_fifo_boosting.sh +++ b/tests/functional/test_fifo_boosting.sh @@ -23,7 +23,7 @@ test_section "Test 1: FIFO Boost with -F Flag" threshold=5 # Create starvation FIRST (before stalld starts) -starvation_duration=$((threshold + 8)) +starvation_duration=$((threshold + 5)) log "Creating starvation on CPU ${TEST_CPU} for ${starvation_duration}s" start_starvation_gen -c ${TEST_CPU} -p 80 -n 2 -d ${starvation_duration} diff --git a/tests/functional/test_fifo_priority_starvation.sh b/tests/functional/test_fifo_priority_starvation.sh index 66075d4..028b825 100755 --- a/tests/functional/test_fifo_priority_starvation.sh +++ b/tests/functional/test_fifo_priority_starvation.sh @@ -73,7 +73,8 @@ log "Starting stalld with boosting enabled" start_stalld_with_log "${STALLD_LOG}" -f -v -N -t $threshold -c ${TEST_CPU} -a ${STALLD_CPU} -d ${boost_duration} # Wait for detection and boosting -sleep $((threshold + boost_duration + 1)) +wait_for_boost_detected "${STALLD_LOG}" +sleep ${boost_duration} ctxt_after=0 if [ -n "${blockee_pid}" ] && [ -f "/proc/${blockee_pid}/status" ]; then @@ -104,7 +105,7 @@ rm -f "${STALLD_LOG}" threshold=3 # Create long starvation to trigger multiple detection cycles -starvation_duration=15 +starvation_duration=12 log "Creating long FIFO-on-FIFO starvation for ${starvation_duration}s" start_starvation_gen -c ${TEST_CPU} -p 10 -b 5 -n 2 -d ${starvation_duration} diff --git a/tests/functional/test_idle_detection.sh b/tests/functional/test_idle_detection.sh index 81a9fe1..cafce11 100755 --- a/tests/functional/test_idle_detection.sh +++ b/tests/functional/test_idle_detection.sh @@ -60,7 +60,7 @@ threshold=3 log "Starting stalld with idle detection on an idle CPU" start_stalld_with_log "${STALLD_LOG}" -f -v -l -t $threshold -c ${TEST_CPU} -a ${STALLD_CPU} -sleep 3 +wait_for_log_message "skipping" 5 "${STALLD_LOG}" assert_log_contains "${STALLD_LOG}" "skipping" "Idle CPU correctly skipped" diff --git a/tests/functional/test_starvation_detection.sh b/tests/functional/test_starvation_detection.sh index 33bbfed..52031c5 100755 --- a/tests/functional/test_starvation_detection.sh +++ b/tests/functional/test_starvation_detection.sh @@ -184,7 +184,8 @@ log "Creating short-lived starvation (3s, less than ${threshold}s threshold)" start_starvation_gen -c ${TEST_CPU} -p 80 -n 1 -d 3 # Wait for task to exit -sleep 5 +wait "${STARVE_PID}" 2>/dev/null || true +sleep 1 assert_process_running "${STALLD_PID}" "stalld still running after task exit" diff --git a/tests/functional/test_starvation_threshold.sh b/tests/functional/test_starvation_threshold.sh index 6e84966..b372a87 100755 --- a/tests/functional/test_starvation_threshold.sh +++ b/tests/functional/test_starvation_threshold.sh @@ -60,14 +60,11 @@ start_starvation_gen -c "${TEST_CPU}" -p 80 -n 2 -d ${starvation_duration} log "Starting stalld with ${threshold}s threshold" start_stalld_with_log "${STALLD_LOG}" -f -v -N -M -g 1 -c "${TEST_CPU}" -a "${STALLD_CPU}" -t ${threshold} -# Wait for starvation duration + small buffer -sleep 8 - # Wait for starvation generator to fully complete wait "${STARVE_PID}" 2>/dev/null || true # Give stalld time to process and log (if it were to detect) -sleep 2 +sleep 1 # Check that starvation_gen was NOT detected (duration less than threshold) assert_log_contains --negate "${STALLD_LOG}" \ diff --git a/tests/functional/test_task_merging.sh b/tests/functional/test_task_merging.sh index 082f07d..784f0de 100755 --- a/tests/functional/test_task_merging.sh +++ b/tests/functional/test_task_merging.sh @@ -28,7 +28,7 @@ log "Starting stalld with ${threshold}s threshold (log-only, verbose)" start_stalld_with_log "${STALLD_LOG}" -f -v -g 1 -l -t $threshold -c ${TEST_CPU} -a ${STALLD_CPU} # Create long starvation to span multiple monitoring cycles -starvation_duration=18 +starvation_duration=12 log "Creating starvation for ${starvation_duration}s (multiple detection cycles)" start_starvation_gen -c ${TEST_CPU} -p 80 -n 2 -d ${starvation_duration} @@ -51,7 +51,7 @@ fi # Wait for second detection cycle log "Waiting for second detection cycle..." -sleep 4 +wait_for_n_log_matches "starved" 2 "${STALLD_LOG}" # Extract second starvation duration second_duration=$(grep "starved.*for [0-9]" "${STALLD_LOG}" | tail -1 | grep -oE "for [0-9]+" | awk '{print $2}') @@ -72,7 +72,7 @@ fi # Wait for third detection to confirm continued accumulation log "Waiting for third detection cycle..." -sleep 4 +wait_for_n_log_matches "starved" 3 "${STALLD_LOG}" third_duration=$(grep "starved.*for [0-9]" "${STALLD_LOG}" | tail -1 | grep -oE "for [0-9]+" | awk '{print $2}') if [ -z "${third_duration}" ]; then @@ -182,8 +182,7 @@ else STARVE_PID1=${STARVE_PID} # Wait for starvation detection on both CPUs - wait_for_starvation_detected "${STALLD_LOG}" - sleep 4 + wait_for_n_log_matches "starved" 2 "${STALLD_LOG}" 10 # Check CPU0 starvation accumulation cpu0_detections=$(grep "starved on CPU ${CPU0}" "${STALLD_LOG}" | wc -l) -- 2.54.0