Commit 9d77734

committed

dump profiles separately only if enabled by env var

1 parent 0696173 commit 9d77734Copy full SHA for 9d77734

File tree

+16

-6

lines changed

+16

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ function runValgrindPhpCgiCommand(`
`125`	`125`	`'-d opcache.jit_buffer_size=128M',`
`126`	`126`	`'-d opcache.validate_timestamps=0',`
`127`	`127`	`...$args,`
`128`		`- ]);`
	`128`	`+ ], null, array_merge(getenv(), ['BENCHMARK_DUMP_SEPARATE_PROFILES' => '1']));`
`129`	`129`
`130`	`130`	`// collect metrics for startup, each benchmark run and shutdown`
`131`	`131`	`$metricsArr = [];`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public function __construct(`
`13`	`13`	`) {}`
`14`	`14`	`}`
`15`	`15`
`16`		`-function runCommand(array $args, ?string $cwd = null): ProcessResult {`
	`16`	`+function runCommand(array $args, ?string $cwd = null, ?array$envVars = null): ProcessResult {`
`17`	`17`	`$cmd = implode('', array_map(function (string\|UnescapedArg $v): string {`
`18`	`18`	`return $v instanceof UnescapedArg`
`19`	`19`	`? $v->arg`
`@@ -22,7 +22,7 @@ function runCommand(array $args, ?string $cwd = null): ProcessResult {`
`22`	`22`	`$pipes = null;`
`23`	`23`	`$descriptorSpec = [0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']];`
`24`	`24`	`fwrite(STDOUT, "> $cmd\n");`
`25`		`- $processHandle = proc_open($cmd, $descriptorSpec, $pipes, $cwd ?? getcwd(), null);`
	`25`	`+ $processHandle = proc_open($cmd, $descriptorSpec, $pipes, $cwd ?? getcwd(), $envVars);`
`26`	`26`
`27`	`27`	`$stdin = $pipes[0];`
`28`	`28`	`$stdout = $pipes[1];`
`@@ -60,7 +60,7 @@ function runCommand(array $args, ?string $cwd = null): ProcessResult {`
`60`	`60`
`61`	`61`	`fclose($stdout);`
`62`	`62`	`fclose($stderr);`
`63`		`-`
	`63`	`+`
`64`	`64`	`$result = new ProcessResult($stdoutStr, $stderrStr);`
`65`	`65`
`66`	`66`	`$statusCode = proc_close($processHandle);`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1696,6 +1696,16 @@ PHP_FUNCTION(apache_response_headers) /* {{{ */`
`1696`	`1696`	`}`
`1697`	`1697`	`/* }}} */`
`1698`	`1698`
	`1699`	`+#ifdef HAVE_VALGRIND`
	`1700`	`+static inline void callgrind_dump_stats(void)`
	`1701`	`+{`
	`1702`	`+ char *tmp = getenv("BENCHMARK_DUMP_SEPARATE_PROFILES");`
	`1703`	`+ if (tmp && ZEND_ATOL(tmp)) {`
	`1704`	`+ CALLGRIND_DUMP_STATS;`
	`1705`	`+ }`
	`1706`	`+}`
	`1707`	`+#endif`
	`1708`	`+`
`1699`	`1709`	`static zend_module_entry cgi_module_entry = {`
`1700`	`1710`	`STANDARD_MODULE_HEADER,`
`1701`	`1711`	`"cgi-fcgi",`
`@@ -2260,7 +2270,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2260`	`2270`	`#ifdef HAVE_VALGRIND`
`2261`	`2271`	`if (benchmark) {`
`2262`	`2272`	`/* measure startup and each benchmark run separately */`
`2263`		`- CALLGRIND_DUMP_STATS;`
	`2273`	`+ callgrind_dump_stats();`
`2264`	`2274`	`}`
`2265`	`2275`	`#endif`
`2266`	`2276`
`@@ -2578,7 +2588,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2578`	`2588`
`2579`	`2589`	`#ifdef HAVE_VALGRIND`
`2580`	`2590`	`/* measure shutdown separately */`
`2581`		`- CALLGRIND_DUMP_STATS;`
	`2591`	`+ callgrind_dump_stats();`
`2582`	`2592`	`#endif`
`2583`	`2593`
`2584`	`2594`	`break;`

Comments

(0)