couple of fixes to prof-accept to automate profiling with valgrind from make target

Author: marc-casavant

src/tests/multi-server/scripts/profiling/start_valgrind_profiling.sh

@@ -2,6 +2,9 @@
 
 # To be run inside the profiling container
 
+# Clear any stale marker from a previous run
+rm -f /etc/prof-results/.profiling_complete
+
 # Load proto_load config to get packet settings
 source /etc/freeradius/proto_load_config.env
 
@@ -30,14 +33,20 @@ until grep -q "Ready to process requests" /tmp/fr.log; do
   sleep 0.1
 done
 
-FR_PID=$(pgrep -f "freeradius -f")
-
-# Enable instrumentation at packet processing start
-callgrind_control --instr=on ${FR_PID}
+# Enable instrumentation. callgrind_control auto-detects the running callgrind
+# instance and prints "PID <n>: freeradius ..." — capture that to get the PID
+# we need later for the graceful shutdown signal.
+CTRL_OUT=$(callgrind_control --instr=on)
+printf '%s\n' "$CTRL_OUT"
+FR_PID=$(printf '%s\n' "$CTRL_OUT" | grep -oP 'PID \K\d+(?=: freeradius)' | head -1)
+echo "Freeradius PID: ${FR_PID}"
 
 # Wait for approximate send duration
 sleep ${SEND_DURATION}
 
 # Graceful shutdown (equivalent to Ctrl+C)
 kill -SIGINT ${FR_PID}
 wait
+
+# Signal that valgrind has finished writing all profiling data
+touch /etc/prof-results/.profiling_complete

src/tests/multi-server/tests/prof-accept/short.ci.test.yml

@@ -13,5 +13,6 @@ loadgen:
   repeat: "no"
 
 # Test framework
-test_timeout: 80
-test_verify_timeout: 70
+test_timeout: 165
+test_state1_verify_timeout: 130
+test_state2_verify_timeout: 5

src/tests/multi-server/tests/prof-accept/template.yml.j2

@@ -48,8 +48,14 @@ states:
               source /etc/freeradius/start_valgrind_profiling.sh
 
             detach: true
+        - execute_command:
+            command: |
+              # Block until valgrind finishes writing all profiling data.
+              # start_valgrind_profiling.sh touches this file after `wait` returns.
+              until [ -f /etc/prof-results/.profiling_complete ]; do sleep 5; done
+              rm -f /etc/prof-results/.profiling_complete
     verify:
-      timeout: {{ test_verify_timeout }}
+      timeout: {{ test_state1_verify_timeout }}
       trigger_mode: unordered
   state_2:
     description: >
@@ -63,5 +69,5 @@ states:
               #cd /etc/prof-results
               #callgrind_annotate $(find . -name "callgrind.out.*" -size +0c | sort) > callgrind_report.txt
     verify:
-      timeout: 5
+      timeout: {{ test_state2_verify_timeout }}
       trigger_mode: unordered