summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/opcache/zend_accelerator_module.c16
2 files changed, 9 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index c0bf5d25ef..7cec6b9370 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PHP NEWS
- OPcache:
. Fixed #78189 (file cache strips last character of uname hash). (cmb)
+ . Fixed #78202 (Opcache stats for cache hits are capped at 32bit NUM). (cmb)
04 Jul 2019, PHP 7.3.7
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 51e86e8b3a..7bcf101d09 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -481,9 +481,9 @@ void zend_accel_info(ZEND_MODULE_INFO_FUNC_ARGS)
char buf[32];
php_info_print_table_row(2, "Startup", "OK");
php_info_print_table_row(2, "Shared memory model", zend_accel_get_shared_model());
- snprintf(buf, sizeof(buf), ZEND_LONG_FMT, (zend_ulong)ZCSG(hits));
+ snprintf(buf, sizeof(buf), ZEND_ULONG_FMT, ZCSG(hits));
php_info_print_table_row(2, "Cache hits", buf);
- snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ZSMMG(memory_exhausted)?ZCSG(misses):ZCSG(misses)-ZCSG(blacklist_misses));
+ snprintf(buf, sizeof(buf), ZEND_ULONG_FMT, ZSMMG(memory_exhausted)?ZCSG(misses):ZCSG(misses)-ZCSG(blacklist_misses));
php_info_print_table_row(2, "Cache misses", buf);
snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ZCG(accel_directives).memory_consumption-zend_shared_alloc_get_free_memory()-ZSMMG(wasted_shared_memory));
php_info_print_table_row(2, "Used memory", buf);
@@ -497,17 +497,17 @@ void zend_accel_info(ZEND_MODULE_INFO_FUNC_ARGS)
snprintf(buf, sizeof(buf), "%zu", (size_t)((char*)ZCSG(interned_strings).end - (char*)ZCSG(interned_strings).top));
php_info_print_table_row(2, "Interned Strings Free memory", buf);
}
- snprintf(buf, sizeof(buf), "%d", ZCSG(hash).num_direct_entries);
+ snprintf(buf, sizeof(buf), "%" PRIu32, ZCSG(hash).num_direct_entries);
php_info_print_table_row(2, "Cached scripts", buf);
- snprintf(buf, sizeof(buf), "%d", ZCSG(hash).num_entries);
+ snprintf(buf, sizeof(buf), "%" PRIu32, ZCSG(hash).num_entries);
php_info_print_table_row(2, "Cached keys", buf);
- snprintf(buf, sizeof(buf), "%d", ZCSG(hash).max_num_entries);
+ snprintf(buf, sizeof(buf), "%" PRIu32, ZCSG(hash).max_num_entries);
php_info_print_table_row(2, "Max keys", buf);
- snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ZCSG(oom_restarts));
+ snprintf(buf, sizeof(buf), ZEND_ULONG_FMT, ZCSG(oom_restarts));
php_info_print_table_row(2, "OOM restarts", buf);
- snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ZCSG(hash_restarts));
+ snprintf(buf, sizeof(buf), ZEND_ULONG_FMT, ZCSG(hash_restarts));
php_info_print_table_row(2, "Hash keys restarts", buf);
- snprintf(buf, sizeof(buf), ZEND_LONG_FMT, ZCSG(manual_restarts));
+ snprintf(buf, sizeof(buf), ZEND_ULONG_FMT, ZCSG(manual_restarts));
php_info_print_table_row(2, "Manual restarts", buf);
}
}