diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-06-13 11:28:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-06-13 11:28:24 +0300 |
| commit | e788e8261ea8eb1b363377f1b185ac6b338607ed (patch) | |
| tree | 1c233438ef025bdada55a154d45dbd5276fec2ea | |
| parent | 2afc83732c1eb416acabace042eb0f5384bea721 (diff) | |
| download | php-git-e788e8261ea8eb1b363377f1b185ac6b338607ed.tar.gz | |
Removed "gc_" prefix.
| -rw-r--r-- | Zend/tests/gc_037.phpt | 8 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 | ||||
| -rw-r--r-- | Zend/zend_gc.c | 4 | ||||
| -rw-r--r-- | Zend/zend_gc.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Zend/tests/gc_037.phpt b/Zend/tests/gc_037.phpt index fc60bcab29..a1f33f047f 100644 --- a/Zend/tests/gc_037.phpt +++ b/Zend/tests/gc_037.phpt @@ -13,18 +13,18 @@ gc_collect_cycles(); var_dump(gc_status()); --EXPECT-- array(3) { - ["gc_runs"]=> + ["runs"]=> int(0) ["collected"]=> int(0) - ["gc_threshold"]=> + ["threshold"]=> int(10001) } array(3) { - ["gc_runs"]=> + ["runs"]=> int(1) ["collected"]=> int(1) - ["gc_threshold"]=> + ["threshold"]=> int(10001) } diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index feee2ddf1d..c03eea82b5 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -398,9 +398,9 @@ ZEND_FUNCTION(gc_status) array_init_size(return_value, 3); - add_assoc_long_ex(return_value, "gc_runs", sizeof("gc_runs")-1, (long)status.gc_runs); + add_assoc_long_ex(return_value, "runs", sizeof("runs")-1, (long)status.runs); add_assoc_long_ex(return_value, "collected", sizeof("collected")-1, (long)status.collected); - add_assoc_long_ex(return_value, "gc_threshold", sizeof("gc_threshold")-1, (long)status.gc_threshold); + add_assoc_long_ex(return_value, "threshold", sizeof("threshold")-1, (long)status.threshold); } /* {{{ proto int func_num_args(void) diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index 3900837a7d..69a24d44be 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -1444,9 +1444,9 @@ ZEND_API int zend_gc_collect_cycles(void) ZEND_API void zend_gc_get_status(zend_gc_status *status) { - status->gc_runs = GC_G(gc_runs); + status->runs = GC_G(gc_runs); status->collected = GC_G(collected); - status->gc_threshold = GC_G(gc_threshold); + status->threshold = GC_G(gc_threshold); } /* diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h index f1bd7a7b92..57cdce4a27 100644 --- a/Zend/zend_gc.h +++ b/Zend/zend_gc.h @@ -25,9 +25,9 @@ BEGIN_EXTERN_C() typedef struct _zend_gc_status { - uint32_t gc_runs; + uint32_t runs; uint32_t collected; - uint32_t gc_threshold; + uint32_t threshold; } zend_gc_status; ZEND_API extern int (*gc_collect_cycles)(void); |