Commit 035a222

committed

dump profiles separately only if enabled by env var

1 parent 0696173 commit 035a222Copy full SHA for 035a222

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ function runValgrindPhpCgiCommand(`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`$process = runCommand([`
	`113`	`+ 'BENCHMARK_DUMP_SEPARATE_PROFILES=1',`
`113`	`114`	`'valgrind',`
`114`	`115`	`'--tool=callgrind',`
`115`	`116`	`'--dump-instr=yes',`

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)