dump profiles separately only if enabled by env var

Author: mvorisek

benchmark/benchmark.php

@@ -110,6 +110,7 @@ function runValgrindPhpCgiCommand(
     }
 
     $process = runCommand([
+        'BENCHMARK_DUMP_SEPARATE_PROFILES=1',
         'valgrind',
         '--tool=callgrind',
         '--dump-instr=yes',

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;