Skip to content

Commit 6f1e5ff

Browse files
authored
Fix GC_BENCH flag (#10823)
zend_gc_globals is now hidden, so we can't access it from zend.c.
1 parent 69ec3c6 commit 6f1e5ff

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

Zend/zend.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,16 +1310,7 @@ ZEND_API void zend_deactivate(void) /* {{{ */
13101310
}
13111311

13121312
#if GC_BENCH
1313-
fprintf(stderr, "GC Statistics\n");
1314-
fprintf(stderr, "-------------\n");
1315-
fprintf(stderr, "Runs: %d\n", GC_G(gc_runs));
1316-
fprintf(stderr, "Collected: %d\n", GC_G(collected));
1317-
fprintf(stderr, "Root buffer length: %d\n", GC_G(root_buf_length));
1318-
fprintf(stderr, "Root buffer peak: %d\n\n", GC_G(root_buf_peak));
1319-
fprintf(stderr, " Possible Remove from Marked\n");
1320-
fprintf(stderr, " Root Buffered buffer grey\n");
1321-
fprintf(stderr, " -------- -------- ----------- ------\n");
1322-
fprintf(stderr, "ZVAL %8d %8d %9d %8d\n", GC_G(zval_possible_root), GC_G(zval_buffered), GC_G(zval_remove_from_buffer), GC_G(zval_marked_grey));
1313+
gc_bench_print();
13231314
#endif
13241315
}
13251316
/* }}} */

Zend/zend_gc.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,6 +1741,22 @@ static void zend_gc_root_tmpvars(void) {
17411741
}
17421742
}
17431743

1744+
#if GC_BENCH
1745+
void gc_bench_print(void)
1746+
{
1747+
fprintf(stderr, "GC Statistics\n");
1748+
fprintf(stderr, "-------------\n");
1749+
fprintf(stderr, "Runs: %d\n", GC_G(gc_runs));
1750+
fprintf(stderr, "Collected: %d\n", GC_G(collected));
1751+
fprintf(stderr, "Root buffer length: %d\n", GC_G(root_buf_length));
1752+
fprintf(stderr, "Root buffer peak: %d\n\n", GC_G(root_buf_peak));
1753+
fprintf(stderr, " Possible Remove from Marked\n");
1754+
fprintf(stderr, " Root Buffered buffer grey\n");
1755+
fprintf(stderr, " -------- -------- ----------- ------\n");
1756+
fprintf(stderr, "ZVAL %8d %8d %9d %8d\n", GC_G(zval_possible_root), GC_G(zval_buffered), GC_G(zval_remove_from_buffer), GC_G(zval_marked_grey));
1757+
}
1758+
#endif
1759+
17441760
#ifdef ZTS
17451761
size_t zend_gc_globals_size(void)
17461762
{

Zend/zend_gc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ ZEND_API bool gc_enabled(void);
4646
ZEND_API bool gc_protect(bool protect);
4747
ZEND_API bool gc_protected(void);
4848

49+
#if GC_BENCH
50+
void gc_bench_print(void);
51+
#endif
52+
4953
/* The default implementation of the gc_collect_cycles callback. */
5054
ZEND_API int zend_gc_collect_cycles(void);
5155

0 commit comments

Comments
 (0)