dump profiles separately only if enabled by env var

Author: mvorisek

benchmark/benchmark.php

@@ -125,7 +125,7 @@ function runValgrindPhpCgiCommand(
         '-d opcache.jit_buffer_size=128M',
         '-d opcache.validate_timestamps=0',
         ...$args,
-    ]);
+    ], null, array_merge(getenv(), ['BENCHMARK_DUMP_SEPARATE_PROFILES' => '1']));
 
     // collect metrics for startup, each benchmark run and shutdown
     $metricsArr = [];

benchmark/shared.php

@@ -13,7 +13,7 @@ public function __construct(
     ) {}
 }
 
-function runCommand(array $args, ?string $cwd = null): ProcessResult {
+function runCommand(array $args, ?string $cwd = null, ?array $envVars = null): ProcessResult {
     $cmd = implode(' ', array_map(function (string|UnescapedArg $v): string {
         return $v instanceof UnescapedArg
             ? $v->arg
@@ -22,7 +22,7 @@ function runCommand(array $args, ?string $cwd = null): ProcessResult {
     $pipes = null;
     $descriptorSpec = [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
     fwrite(STDOUT, "> $cmd\n");
-    $processHandle = proc_open($cmd, $descriptorSpec, $pipes, $cwd ?? getcwd(), null);
+    $processHandle = proc_open($cmd, $descriptorSpec, $pipes, $cwd ?? getcwd(), $envVars);
 
     $stdin = $pipes[0];
     $stdout = $pipes[1];
@@ -60,7 +60,7 @@ function runCommand(array $args, ?string $cwd = null): ProcessResult {
 
     fclose($stdout);
     fclose($stderr);
-    
+
     $result = new ProcessResult($stdoutStr, $stderrStr);
 
     $statusCode = proc_close($processHandle);

sapi/cgi/cgi_main.c

@@ -1696,6 +1696,16 @@ PHP_FUNCTION(apache_response_headers) /* {{{ */
 }
 /* }}} */
 
+#ifdef HAVE_VALGRIND
+static inline void callgrind_dump_stats(void)
+{
+	char *tmp = getenv("BENCHMARK_DUMP_SEPARATE_PROFILES");
+	if (tmp && ZEND_ATOL(tmp)) {
+		CALLGRIND_DUMP_STATS;
+	}
+}
+#endif
+
 static zend_module_entry cgi_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"cgi-fcgi",
@@ -2260,7 +2270,7 @@ consult the installation file that came with this distribution, or visit \n\
 #ifdef HAVE_VALGRIND
 			if (benchmark) {
 				/* measure startup and each benchmark run separately */
-				CALLGRIND_DUMP_STATS;
+				callgrind_dump_stats();
 			}
 #endif
 
@@ -2578,7 +2588,7 @@ consult the installation file that came with this distribution, or visit \n\
 
 #ifdef HAVE_VALGRIND
 				/* measure shutdown separately */
-				CALLGRIND_DUMP_STATS;
+				callgrind_dump_stats();
 #endif
 
 				break;