updated all profiling tests to be inline with prof-accept

marc-casavant · marc-casavant · commit 87d7c6e45415 · 2026-04-30T15:53:47.000-04:00
diff --git a/src/tests/multi-server/environments/profiling-ldap.yml.j2 b/src/tests/multi-server/environments/profiling-ldap.yml.j2
@@ -35,6 +35,8 @@ services:
     - ${DATA_PATH}/freeradius/profiling-ldap/proto_load_config.env:/etc/freeradius/proto_load_config.env
     - ${DATA_PATH}/freeradius/profiling-ldap/load-generator-packets/:/etc/freeradius/load-generator-packets/
     - ${DATA_PATH}/freeradius/profiling-ldap/stats/load-generator-stats.csv:/etc/freeradius/stats/load-generator-stats.csv
+    # Profiling scripts
+    - ${DATA_PATH}/start_valgrind_profiling.sh:/etc/freeradius/start_valgrind_profiling.sh
     # Profiling results directory
     - ${DATA_PATH}/prof-results/:/etc/prof-results/
     # Listener directory
@@ -49,3 +51,4 @@ services:
       # Start the server after configuring environment variables from test case's template.yml.j2 file.
       sleep infinity
     <<: *id001
+
diff --git a/src/tests/multi-server/environments/profiling-pap-auth.yml.j2 b/src/tests/multi-server/environments/profiling-pap-auth.yml.j2
@@ -23,6 +23,8 @@ services:
     - ${DATA_PATH}/freeradius/profiling-server-pap-auth/proto_load_config.env:/etc/freeradius/proto_load_config.env
     - ${DATA_PATH}/freeradius/profiling-server-pap-auth/load-generator-packets/:/etc/freeradius/load-generator-packets/
     - ${DATA_PATH}/freeradius/profiling-server-pap-auth/stats/load-generator-stats.csv:/etc/freeradius/stats/load-generator-stats.csv
+    # Profiling scripts
+    - ${DATA_PATH}/start_valgrind_profiling.sh:/etc/freeradius/start_valgrind_profiling.sh
     # Profiling results directory
     - ${DATA_PATH}/prof-results/:/etc/prof-results/
     # Listener directory
diff --git a/src/tests/multi-server/tests/prof-accept/template.yml.j2 b/src/tests/multi-server/tests/prof-accept/template.yml.j2
@@ -33,18 +33,6 @@ states:
               # No profiling
               #exec freeradius -f -l stdout
 
-              # Valgrind/callgrind profiling
-              #exec valgrind \
-              #  --tool=callgrind \
-              #  --callgrind-out-file=/etc/prof-results/callgrind.out.%p \
-              #  --trace-children=yes \
-              #  --separate-threads=yes \
-              #  --dump-instr=yes \
-              #  --collect-jumps=yes \
-              #  --cache-sim=yes \
-              #  --branch-sim=yes \
-              #  freeradius -f -l stdout -S resources.talloc_skip_cleanup=yes
-
               source /etc/freeradius/start_valgrind_profiling.sh
 
             detach: true
@@ -66,8 +54,8 @@ states:
         - execute_command:
             command: |
               # Generate report from non-empty callgrind.out.* output files
-              #cd /etc/prof-results
-              #callgrind_annotate $(find . -name "callgrind.out.*" -size +0c | sort) > callgrind_report.txt
+              cd /etc/prof-results
+              callgrind_annotate $(find . -name "callgrind.out.*" -size +0c | sort) > callgrind_report.txt
     verify:
       timeout: {{ test_state2_verify_timeout }}
       trigger_mode: unordered
diff --git a/src/tests/multi-server/tests/prof-ldap/short.ci.test.yml b/src/tests/multi-server/tests/prof-ldap/short.ci.test.yml
@@ -4,14 +4,15 @@
 
 # Load generator configuration
 loadgen:
-  start_pps: 500
-  max_pps: 1000
-  duration: 5
-  step: 500
+  start_pps: 100
+  max_pps: 100
+  duration: 60
+  step: 100
   parallel: 1
   max_backlog: 1000
   repeat: "no"
 
 # Test framework
-test_timeout: 50
-test_verify_timeout: 40
+test_timeout: 165
+test_state1_verify_timeout: 130
+test_state2_verify_timeout: 5
diff --git a/src/tests/multi-server/tests/prof-ldap/template.yml.j2 b/src/tests/multi-server/tests/prof-ldap/template.yml.j2
@@ -33,21 +33,17 @@ states:
               # No profiling
               #exec freeradius -f -l stdout
 
-              # Valgrind/callgrind profiling
-              exec valgrind \
-                --tool=callgrind \
-                --callgrind-out-file=/etc/prof-results/callgrind.out.%p \
-                --trace-children=yes \
-                --separate-threads=yes \
-                --dump-instr=yes \
-                --collect-jumps=yes \
-                --cache-sim=yes \
-                --branch-sim=yes \
-                freeradius -f -l stdout -S resources.talloc_skip_cleanup=yes
+              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: >
@@ -61,5 +57,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
diff --git a/src/tests/multi-server/tests/prof-pap-auth/short.ci.test.yml b/src/tests/multi-server/tests/prof-pap-auth/short.ci.test.yml
@@ -4,14 +4,15 @@
 
 # Load generator configuration
 loadgen:
-  start_pps: 500
-  max_pps: 1000
-  duration: 5
-  step: 500
+  start_pps: 100
+  max_pps: 100
+  duration: 60
+  step: 100
   parallel: 1
   max_backlog: 1000
   repeat: "no"
 
 # Test framework
-test_timeout: 50
-test_verify_timeout: 40
+test_timeout: 165
+test_state1_verify_timeout: 130
+test_state2_verify_timeout: 5
diff --git a/src/tests/multi-server/tests/prof-pap-auth/template.yml.j2 b/src/tests/multi-server/tests/prof-pap-auth/template.yml.j2
@@ -33,21 +33,17 @@ states:
               # No profiling
               #exec freeradius -f -l stdout
 
-              # Valgrind/callgrind profiling
-              exec valgrind \
-                --tool=callgrind \
-                --callgrind-out-file=/etc/prof-results/callgrind.out.%p \
-                --trace-children=yes \
-                --separate-threads=yes \
-                --dump-instr=yes \
-                --collect-jumps=yes \
-                --cache-sim=yes \
-                --branch-sim=yes \
-                freeradius -f -l stdout -S resources.talloc_skip_cleanup=yes
+              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: >
@@ -61,5 +57,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
