diff --git a/php_apc.c b/php_apc.c
index 081b62a5..392b05ac 100644
--- a/php_apc.c
+++ b/php_apc.c
@@ -58,11 +58,10 @@
#include "SAPI.h"
#include "php_apc.h"
-#if HAVE_SIGACTION
+#ifdef HAVE_SIGACTION
#include "apc_signal.h"
#endif
-/* {{{ ZEND_DECLARE_MODULE_GLOBALS(apcu) */
ZEND_DECLARE_MODULE_GLOBALS(apcu)
/* True globals */
@@ -87,26 +86,10 @@ static void php_apc_init_globals(zend_apcu_globals* apcu_globals)
apcu_globals->serializer_name = NULL;
apcu_globals->entry_level = 0;
}
-/* }}} */
-/* {{{ PHP_INI */
+/* PHP_INI */
-static PHP_INI_MH(OnUpdateShmSegments) /* {{{ */
-{
- zend_long shm_segments = ZEND_STRTOL(new_value->val, NULL, 10);
-#if APC_MMAP
- if (shm_segments != 1) {
- php_error_docref(NULL, E_WARNING, "apc.shm_segments setting ignored in MMAP mode");
- }
- APCG(shm_segments) = 1;
-#else
- APCG(shm_segments) = shm_segments;
-#endif
- return SUCCESS;
-}
-/* }}} */
-
-static PHP_INI_MH(OnUpdateShmSize) /* {{{ */
+static PHP_INI_MH(OnUpdateShmSize)
{
#if PHP_VERSION_ID >= 80200
zend_long s = zend_ini_parse_quantity_warn(new_value, entry->name);
@@ -129,18 +112,43 @@ static PHP_INI_MH(OnUpdateShmSize) /* {{{ */
return SUCCESS;
}
-/* }}} */
+
+#if defined(APC_MMAP)
+static PHP_INI_MH(OnUpdateMmapHugepageSize)
+{
+ zend_long s;
+
+#if PHP_VERSION_ID >= 80200
+ s = zend_ini_parse_quantity_warn(new_value, entry->name);
+#else
+ s = zend_atol(new_value->val, new_value->len);
+#endif
+
+ if (s < 0) {
+ php_error_docref(NULL, E_CORE_ERROR, "apc.mmap_hugepage_size must be a positive integer");
+ return FAILURE;
+ }
+
+ if (s & (s - 1)) {
+ php_error_docref(NULL, E_CORE_ERROR, "apc.mmap_hugepage_size must be a power of 2");
+ return FAILURE;
+ }
+
+ APCG(mmap_hugepage_size) = s;
+ return SUCCESS;
+}
+#endif
PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("apc.enabled", "1", PHP_INI_SYSTEM, OnUpdateBool, enabled, zend_apcu_globals, apcu_globals)
-STD_PHP_INI_ENTRY("apc.shm_segments", "1", PHP_INI_SYSTEM, OnUpdateShmSegments, shm_segments, zend_apcu_globals, apcu_globals)
STD_PHP_INI_ENTRY("apc.shm_size", "32M", PHP_INI_SYSTEM, OnUpdateShmSize, shm_size, zend_apcu_globals, apcu_globals)
-STD_PHP_INI_ENTRY("apc.entries_hint", "4096", PHP_INI_SYSTEM, OnUpdateLong, entries_hint, zend_apcu_globals, apcu_globals)
+STD_PHP_INI_ENTRY("apc.entries_hint", "0", PHP_INI_SYSTEM, OnUpdateLong, entries_hint, zend_apcu_globals, apcu_globals)
STD_PHP_INI_ENTRY("apc.gc_ttl", "3600", PHP_INI_SYSTEM, OnUpdateLong, gc_ttl, zend_apcu_globals, apcu_globals)
STD_PHP_INI_ENTRY("apc.ttl", "0", PHP_INI_SYSTEM, OnUpdateLong, ttl, zend_apcu_globals, apcu_globals)
STD_PHP_INI_ENTRY("apc.smart", "0", PHP_INI_SYSTEM, OnUpdateLong, smart, zend_apcu_globals, apcu_globals)
-#if APC_MMAP
-STD_PHP_INI_ENTRY("apc.mmap_file_mask", NULL, PHP_INI_SYSTEM, OnUpdateString, mmap_file_mask, zend_apcu_globals, apcu_globals)
+#ifdef APC_MMAP
+STD_PHP_INI_ENTRY("apc.mmap_file_mask", NULL, PHP_INI_SYSTEM, OnUpdateString, mmap_file_mask, zend_apcu_globals, apcu_globals)
+STD_PHP_INI_ENTRY("apc.mmap_hugepage_size", "0", PHP_INI_SYSTEM, OnUpdateMmapHugepageSize, mmap_hugepage_size, zend_apcu_globals, apcu_globals)
#endif
STD_PHP_INI_BOOLEAN("apc.enable_cli", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_cli, zend_apcu_globals, apcu_globals)
STD_PHP_INI_BOOLEAN("apc.slam_defense", "0", PHP_INI_SYSTEM, OnUpdateBool, slam_defense, zend_apcu_globals, apcu_globals)
@@ -150,14 +158,11 @@ STD_PHP_INI_BOOLEAN("apc.use_request_time", "0", PHP_INI_ALL, OnUpdateBool, use_
STD_PHP_INI_ENTRY("apc.serializer", "php", PHP_INI_SYSTEM, OnUpdateStringUnempty, serializer_name, zend_apcu_globals, apcu_globals)
PHP_INI_END()
-/* }}} */
-
zend_bool apc_is_enabled(void)
{
return APCG(enabled);
}
-/* {{{ PHP_MINFO_FUNCTION(apcu) */
static PHP_MINFO_FUNCTION(apcu)
{
php_info_print_table_start();
@@ -168,7 +173,7 @@ static PHP_MINFO_FUNCTION(apcu)
#else
php_info_print_table_row(2, "APCu Debugging", "Disabled");
#endif
-#if APC_MMAP
+#ifdef APC_MMAP
php_info_print_table_row(2, "MMAP Support", "Enabled");
php_info_print_table_row(2, "MMAP File Mask", APCG(mmap_file_mask));
#else
@@ -204,9 +209,7 @@ static PHP_MINFO_FUNCTION(apcu)
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
}
-/* }}} */
-/* {{{ PHP_MINIT_FUNCTION(apcu) */
static PHP_MINIT_FUNCTION(apcu)
{
#if defined(ZTS) && defined(COMPILE_DL_APCU)
@@ -235,10 +238,12 @@ static PHP_MINIT_FUNCTION(apcu)
if (APCG(enabled)) {
if (!APCG(initialized)) {
-#if APC_MMAP
- char *mmap_file_mask = APCG(mmap_file_mask);
-#else
char *mmap_file_mask = NULL;
+ zend_long mmap_hugepage_size = 0;
+
+#ifdef APC_MMAP
+ mmap_file_mask = APCG(mmap_file_mask);
+ mmap_hugepage_size = APCG(mmap_hugepage_size);
#endif
/* ensure this runs only once */
@@ -247,7 +252,7 @@ static PHP_MINIT_FUNCTION(apcu)
/* initialize shared memory allocator */
apc_sma_init(
&apc_sma, (void **) &apc_user_cache, (apc_sma_expunge_f) apc_cache_default_expunge,
- APCG(shm_segments), APCG(shm_size), mmap_file_mask);
+ APCG(shm_size), APC_ENTRY_SIZE(0), mmap_file_mask, mmap_hugepage_size);
REGISTER_LONG_CONSTANT(APC_SERIALIZER_CONSTANT, (zend_long)&_apc_register_serializer, CONST_PERSISTENT | CONST_CS);
@@ -277,9 +282,7 @@ static PHP_MINIT_FUNCTION(apcu)
return SUCCESS;
}
-/* }}} */
-/* {{{ PHP_MSHUTDOWN_FUNCTION(apcu) */
static PHP_MSHUTDOWN_FUNCTION(apcu)
{
#define X(str) zend_string_release(apc_str_ ## str);
@@ -300,7 +303,7 @@ static PHP_MSHUTDOWN_FUNCTION(apcu)
APCG(initialized) = 0;
}
-#if HAVE_SIGACTION
+#ifdef HAVE_SIGACTION
apc_shutdown_signals();
#endif
}
@@ -309,9 +312,8 @@ static PHP_MSHUTDOWN_FUNCTION(apcu)
UNREGISTER_INI_ENTRIES();
return SUCCESS;
-} /* }}} */
+}
-/* {{{ PHP_RINIT_FUNCTION(apcu) */
static PHP_RINIT_FUNCTION(apcu)
{
#if defined(ZTS) && defined(COMPILE_DL_APCU)
@@ -325,15 +327,14 @@ static PHP_RINIT_FUNCTION(apcu)
apc_cache_serializer(apc_user_cache, APCG(serializer_name));
}
-#if HAVE_SIGACTION
+#ifdef HAVE_SIGACTION
apc_set_signals();
#endif
}
return SUCCESS;
}
-/* }}} */
-/* {{{ proto void apcu_clear_cache() */
+/* proto void apcu_clear_cache() */
PHP_FUNCTION(apcu_clear_cache)
{
if (zend_parse_parameters_none() == FAILURE) {
@@ -343,9 +344,8 @@ PHP_FUNCTION(apcu_clear_cache)
apc_cache_clear(apc_user_cache);
RETURN_TRUE;
}
-/* }}} */
-/* {{{ proto array apcu_cache_info([bool limited]) */
+/* proto array apcu_cache_info([bool limited]) */
PHP_FUNCTION(apcu_cache_info)
{
zend_bool limited = 0;
@@ -360,9 +360,8 @@ PHP_FUNCTION(apcu_cache_info)
RETURN_FALSE;
}
}
-/* }}} */
-/* {{{ proto array apcu_key_info(string key) */
+/* proto array apcu_key_info(string key) */
PHP_FUNCTION(apcu_key_info)
{
zend_string *key;
@@ -372,14 +371,11 @@ PHP_FUNCTION(apcu_key_info)
ZEND_PARSE_PARAMETERS_END();
apc_cache_stat(apc_user_cache, key, return_value);
-} /* }}} */
+}
-/* {{{ proto array apcu_sma_info([bool limited]) */
+/* proto array apcu_sma_info([bool limited]) */
PHP_FUNCTION(apcu_sma_info)
{
- apc_sma_info_t* info;
- zval block_lists;
- int i;
zend_bool limited = 0;
ZEND_PARSE_PARAMETERS_START(0, 1)
@@ -387,15 +383,15 @@ PHP_FUNCTION(apcu_sma_info)
Z_PARAM_BOOL(limited)
ZEND_PARSE_PARAMETERS_END();
- info = apc_sma_info(&apc_sma, limited);
+ apc_sma_info_t *info = apc_sma_info(&apc_sma, limited);
if (!info) {
php_error_docref(NULL, E_WARNING, "No APC SMA info available. Perhaps APC is disabled via apc.enabled?");
RETURN_FALSE;
}
- array_init(return_value);
- add_assoc_long(return_value, "num_seg", info->num_seg);
+ array_init(return_value);
+ add_assoc_long(return_value, "num_seg", 1);
add_assoc_double(return_value, "seg_size", (double)info->seg_size);
add_assoc_double(return_value, "avail_mem", (double)apc_sma_get_avail_mem(&apc_sma));
@@ -404,30 +400,29 @@ PHP_FUNCTION(apcu_sma_info)
return;
}
- array_init(&block_lists);
-
- for (i = 0; i < info->num_seg; i++) {
- apc_sma_link_t* p;
- zval list;
-
- array_init(&list);
- for (p = info->list[i]; p != NULL; p = p->next) {
- zval link;
+ /* generate list of free blocks */
+ apc_sma_link_t *p;
+ zval list;
+ array_init(&list);
+ for (p = info->list; p != NULL; p = p->next) {
+ zval link;
+
+ array_init(&link);
+ add_assoc_long(&link, "size", p->size);
+ add_assoc_long(&link, "offset", p->offset);
+ add_next_index_zval(&list, &link);
+ }
- array_init(&link);
+ /* Since support for multiple shm segments has been dropped, the "block_lists" array
+ * only exists to ensure compatibility with existing PHP scripts. */
+ zval block_lists;
+ array_init(&block_lists);
+ add_next_index_zval(&block_lists, &list);
- add_assoc_long(&link, "size", p->size);
- add_assoc_long(&link, "offset", p->offset);
- add_next_index_zval(&list, &link);
- }
- add_next_index_zval(&block_lists, &list);
- }
add_assoc_zval(return_value, "block_lists", &block_lists);
apc_sma_free_info(&apc_sma, info);
}
-/* }}} */
-/* {{{ php_apc_update */
zend_bool php_apc_update(
zend_string *key, apc_cache_atomic_updater_t updater, void *data,
zend_bool insert_if_not_found, time_t ttl)
@@ -439,10 +434,7 @@ zend_bool php_apc_update(
return apc_cache_atomic_update_long(apc_user_cache, key, updater, data, insert_if_not_found, ttl);
}
-/* }}} */
-/* {{{ apc_store_helper(INTERNAL_FUNCTION_PARAMETERS, const zend_bool exclusive)
- */
static void apc_store_helper(INTERNAL_FUNCTION_PARAMETERS, const zend_bool exclusive)
{
zval *key;
@@ -498,33 +490,24 @@ static void apc_store_helper(INTERNAL_FUNCTION_PARAMETERS, const zend_bool exclu
RETURN_FALSE;
}
}
-/* }}} */
-/* {{{ proto bool apcu_enabled(void)
- returns true when apcu is usable in the current environment */
+/* proto bool apcu_enabled(void): returns true when apcu is usable in the current environment */
PHP_FUNCTION(apcu_enabled) {
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_BOOL(APCG(enabled));
}
-/* }}} */
-/* {{{ proto int apcu_store(mixed key, mixed var [, long ttl ])
- */
+/* proto int apcu_store(mixed key, mixed var [, long ttl ]) */
PHP_FUNCTION(apcu_store) {
apc_store_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
-/* }}} */
-/* {{{ proto int apcu_add(mixed key, mixed var [, long ttl ])
- */
+/* proto int apcu_add(mixed key, mixed var [, long ttl ]) */
PHP_FUNCTION(apcu_add) {
apc_store_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
-/* }}} */
-
-/* {{{ php_inc_updater */
struct php_inc_updater_args {
zend_long step;
@@ -537,8 +520,7 @@ static zend_bool php_inc_updater(apc_cache_t *cache, zend_long *entry, void *dat
return 1;
}
-/* {{{ proto long apcu_inc(string key [, long step [, bool& success [, long ttl]]])
- */
+/* proto long apcu_inc(string key [, long step [, bool& success [, long ttl]]]) */
PHP_FUNCTION(apcu_inc) {
zend_string *key;
struct php_inc_updater_args args;
@@ -567,10 +549,8 @@ PHP_FUNCTION(apcu_inc) {
RETURN_FALSE;
}
-/* }}} */
-/* {{{ proto long apcu_dec(string key [, long step [, bool &success [, long ttl]]])
- */
+/* proto long apcu_dec(string key [, long step [, bool &success [, long ttl]]]) */
PHP_FUNCTION(apcu_dec) {
zend_string *key;
struct php_inc_updater_args args;
@@ -600,19 +580,15 @@ PHP_FUNCTION(apcu_dec) {
RETURN_FALSE;
}
-/* }}} */
-/* {{{ php_cas_updater */
static zend_bool php_cas_updater(apc_cache_t *cache, zend_long *entry, void *data) {
zend_long *vals = (zend_long *) data;
zend_long old = vals[0];
zend_long new = vals[1];
return ATOMIC_CAS(*entry, old, new);
}
-/* }}} */
-/* {{{ proto int apcu_cas(string key, int old, int new)
- */
+/* proto int apcu_cas(string key, int old, int new) */
PHP_FUNCTION(apcu_cas) {
zend_string *key;
zend_long vals[2];
@@ -630,10 +606,8 @@ PHP_FUNCTION(apcu_cas) {
RETURN_BOOL(apc_cache_atomic_update_long(apc_user_cache, key, php_cas_updater, &vals, 0, 0));
}
-/* }}} */
-/* {{{ proto mixed apcu_fetch(mixed key[, bool &success])
- */
+/* proto mixed apcu_fetch(mixed key[, bool &success]) */
PHP_FUNCTION(apcu_fetch) {
zval *key;
zval *success = NULL;
@@ -685,10 +659,8 @@ PHP_FUNCTION(apcu_fetch) {
RETURN_FALSE;
}
}
-/* }}} */
-/* {{{ proto mixed apcu_exists(mixed key)
- */
+/* proto mixed apcu_exists(mixed key) */
PHP_FUNCTION(apcu_exists) {
zval *key;
time_t t;
@@ -728,10 +700,8 @@ PHP_FUNCTION(apcu_exists) {
RETURN_FALSE;
}
}
-/* }}} */
-/* {{{ proto mixed apcu_delete(mixed keys)
- */
+/* proto mixed apcu_delete(mixed keys) */
PHP_FUNCTION(apcu_delete) {
zval *keys;
@@ -780,7 +750,6 @@ PHP_FUNCTION(apcu_entry) {
apc_cache_entry(apc_user_cache, key, &fci, &fcc, ttl, now, return_value);
}
-/* }}} */
#ifdef APC_DEBUG
/* This function is used to test TTL behavior without having to perform sleeps. */
@@ -805,8 +774,7 @@ PHP_FUNCTION(apcu_inc_request_time) {
}
#endif
-/* {{{ module definition structure */
-
+/* module definition structure */
zend_module_entry apcu_module_entry = {
STANDARD_MODULE_HEADER,
PHP_APCU_EXTNAME,
@@ -819,7 +787,6 @@ zend_module_entry apcu_module_entry = {
PHP_APCU_VERSION,
STANDARD_MODULE_PROPERTIES
};
-/* }}} */
#ifdef COMPILE_DL_APCU
ZEND_GET_MODULE(apcu)
@@ -827,7 +794,6 @@ ZEND_GET_MODULE(apcu)
ZEND_TSRMLS_CACHE_DEFINE();
#endif
#endif
-/* }}} */
/*
* Local variables:
diff --git a/php_apc.h b/php_apc.h
index 4456f3f9..96f5b01e 100644
--- a/php_apc.h
+++ b/php_apc.h
@@ -33,7 +33,7 @@
#include "apc.h"
#include "apc_globals.h"
-#define PHP_APCU_VERSION "5.1.23-dev"
+#define PHP_APCU_VERSION "5.1.28"
#define PHP_APCU_EXTNAME "apcu"
PHP_APCU_API zend_bool apc_is_enabled(void);
diff --git a/tests/apc54_014.phpt b/tests/apc54_014.phpt
index e3591c39..fcfb92b6 100644
--- a/tests/apc54_014.phpt
+++ b/tests/apc54_014.phpt
@@ -3,7 +3,7 @@ APC: Bug #61742 preload_path does not work due to incorrect string length (varia
--SKIPIF--
diff --git a/tests/apc_006.phpt b/tests/apc_006.phpt
index 6ec03915..6df3b7c8 100644
--- a/tests/apc_006.phpt
+++ b/tests/apc_006.phpt
@@ -9,7 +9,6 @@ if (PHP_VERSION_ID >= 70300) die('skip Only for PHP < 7.3');
apc.enabled=1
apc.enable_cli=1
apc.serializer=php
-report_memleaks=0
--FILE--
= 80100) die('skip Only for PHP < 8.1');
apc.enabled=1
apc.enable_cli=1
apc.serializer=php
-report_memleaks=0
--FILE--
= 8.1');
apc.enabled=1
apc.enable_cli=1
apc.serializer=php
-report_memleaks=0
--FILE--
--INI--
apc.enabled=1
@@ -34,7 +34,7 @@ var_dump(apcu_fetch("EzFY"));
--EXPECT--
T+2
bool(false)
-int(42)
+bool(false)
T+4
bool(false)
bool(false)
diff --git a/tests/apc_020.phpt b/tests/apc_020.phpt
index a4537eaa..bd497f11 100644
--- a/tests/apc_020.phpt
+++ b/tests/apc_020.phpt
@@ -3,7 +3,7 @@ Test default expunge logic wrt global and per-entry TTLs
--SKIPIF--
--INI--
apc.enabled=1
@@ -14,22 +14,27 @@ apc.shm_size=1M
--FILE--
= $entry_size) {
+ apcu_store(sprintf("key%06d", $i), str_repeat('x', 500));
+ $i++;
+}
apcu_inc_request_time(1);
apcu_fetch("no_ttl_accessed");
apcu_inc_request_time(1);
-// Fill the cache
-$i = 0;
-while (apcu_exists("dummy")) {
- apcu_store("key" . $i, str_repeat('x', 500));
- $i++;
-}
+// Trigger a default expunge after the entries have soft-expired.
+apcu_store("large_entry", str_repeat('x', 1000));
var_dump(apcu_fetch("no_ttl_unaccessed"));
var_dump(apcu_fetch("no_ttl_accessed"));
@@ -39,4 +44,4 @@ var_dump(apcu_fetch("ttl"));
--EXPECT--
bool(false)
int(24)
-int(42)
+bool(false)
diff --git a/tests/apc_026.phpt b/tests/apc_026.phpt
index 0fcfe9da..947f016e 100644
--- a/tests/apc_026.phpt
+++ b/tests/apc_026.phpt
@@ -1,60 +1,21 @@
--TEST--
-apcu_inc/dec() should not inc/dec soft expired entries based on global TTL setting
---SKIPIF--
-
+Huge allocations which don't fit into shm shouldn't cause cache wipes
--INI--
apc.enabled=1
apc.enable_cli=1
-apc.use_request_time=1
-apc.ttl=2
+apc.shm_size=1M
--FILE--
--EXPECT--
-T+0:
-int(1)
-int(1)
-int(-1)
-int(-1)
-T+1:
-int(2)
-int(2)
-int(-2)
-int(-2)
-T+4:
-int(1)
-int(1)
-int(-1)
-int(-1)
+bool(false)
+bool(true)
diff --git a/tests/apc_defrag.phpt b/tests/apc_defrag.phpt
new file mode 100644
index 00000000..533772b5
--- /dev/null
+++ b/tests/apc_defrag.phpt
@@ -0,0 +1,102 @@
+--TEST--
+Test defragmentation
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.use_request_time=1
+apc.shm_size=1M
+--FILE--
+= $entry_size) {
+ $i++;
+ apcu_store(sprintf("ttl3_%010d", $i), $i, 3);
+
+ if (apcu_sma_info(true)['avail_mem'] >= $entry_size) {
+ apcu_store(sprintf("ttl1_%010d", $i), $i, 1);
+ }
+ }
+
+ return $i;
+}
+
+// store the first entry with ttl=1, which causes all entries
+// behind this entry to be moved during defragmentation
+apcu_store("ttl1_int", 123, 1);
+
+// store entries of different datatypes with ttl=3, which must be present after expiration + defragmentation
+$reference = "b";
+apcu_store("ttl3_int", 123456789, 3);
+apcu_store("ttl3_string", "abc", 3);
+apcu_store("ttl3_array", [1, "a", &$reference, []], 3);
+apcu_store("ttl3_object", (object) ["prop1" => "val1", "prop2" => 2], 3);
+
+// safe available memory for later comparison
+$avail_before_filled = apcu_sma_info(true)['avail_mem'];
+
+// fill cache with alternating ttl=1 + ttl=3 entries
+fill_cache();
+
+// expire all ttl1_* entries
+apcu_inc_request_time(2);
+
+// this insertion should trigger an default_expunge which removes all ttl1_ entries and performs a defragmentation
+var_dump(apcu_store("large_entry", str_repeat('x', 1000), 1));
+
+// delete large_entry to be able to check the available memory in the next step
+var_dump(apcu_delete("large_entry"));
+
+// the defragmentation should have freed more than 50% of the filled memory, because "ttl1_int" was also freed
+var_dump(apcu_sma_info(true)['avail_mem'] > $avail_before_filled / 2);
+
+// after the default expunge, all ttl1_ entries should not be present anymore
+var_dump(apcu_fetch("ttl1_int") === false);
+
+// all ttl3_ entries must be present (and correct after defragmentation)
+var_dump(apcu_fetch("ttl3_int") === 123456789);
+var_dump(apcu_fetch("ttl3_string") === "abc");
+var_dump(apcu_fetch("ttl3_array") === [1, "a", &$reference, []]);
+var_dump(apcu_fetch("ttl3_object") == (object) ["prop1" => "val1", "prop2" => 2]);
+
+// check that cache cleanup and defragmentation have been performed, but no real expunge
+var_dump(apcu_cache_info(true)["cleanups"] === 1);
+var_dump(apcu_cache_info(true)["defragmentations"] === 1);
+var_dump(apcu_cache_info(true)["expunges"] === 0);
+
+// this insertion should trigger an default_expunge which performs a real expunge (but no defragmentation)
+var_dump(apcu_store("huge_entry", str_repeat('x', 700000), 1));
+
+// check that cache cleanup and real expunge have been performed, but no defragmentation
+var_dump(apcu_cache_info(true)["cleanups"] === 2);
+var_dump(apcu_cache_info(true)["defragmentations"] === 1);
+var_dump(apcu_cache_info(true)["expunges"] === 1);
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/tests/apc_entry_002.phpt b/tests/apc_entry_002.phpt
index 61f833a8..baf9aafb 100644
--- a/tests/apc_entry_002.phpt
+++ b/tests/apc_entry_002.phpt
@@ -14,7 +14,7 @@ $value = apcu_entry("test", function($key){
--EXPECTF--
Fatal error: Uncaught Exception: test in %s:3
Stack trace:
-#0 [internal function]: {closure}('test')
+#0 [internal function]: {closure%S}('test')
#1 %s(%d): apcu_entry('test', Object(Closure))
#2 {main}
thrown in %s on line 3
diff --git a/tests/apc_entry_003.phpt b/tests/apc_entry_003.phpt
index e04bf4bd..d074f9ae 100644
--- a/tests/apc_entry_003.phpt
+++ b/tests/apc_entry_003.phpt
@@ -9,7 +9,8 @@ apc.enable_cli=1
--EXPECTF--
diff --git a/tests/apc_mmap_hugepage_001.phpt b/tests/apc_mmap_hugepage_001.phpt
new file mode 100644
index 00000000..54e2b4ad
--- /dev/null
+++ b/tests/apc_mmap_hugepage_001.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Disable hugepage
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.mmap_hugepage_size=0
+apc.shm_size=2M
+--FILE--
+===DONE===
+--EXPECT--
+===DONE===
diff --git a/tests/apc_mmap_hugepage_002.phpt b/tests/apc_mmap_hugepage_002.phpt
new file mode 100644
index 00000000..106e6abf
--- /dev/null
+++ b/tests/apc_mmap_hugepage_002.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Enable hugepage
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.mmap_hugepage_size=2M
+apc.shm_size=2M
+--FILE--
+===DONE===
+--EXPECT--
+===DONE===
diff --git a/tests/apc_mmap_hugepage_003.phpt b/tests/apc_mmap_hugepage_003.phpt
new file mode 100644
index 00000000..0fdfd9bf
--- /dev/null
+++ b/tests/apc_mmap_hugepage_003.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Error if apc.mmap_hugepage_size is negative
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.mmap_hugepage_size=-1
+apc.shm_size=2M
+--FILE--
+Irrelevant
+--EXPECTF--
+%A: apc.mmap_hugepage_size must be a positive integer in Unknown on line 0
diff --git a/tests/apc_mmap_hugepage_004.phpt b/tests/apc_mmap_hugepage_004.phpt
new file mode 100644
index 00000000..8505c4f7
--- /dev/null
+++ b/tests/apc_mmap_hugepage_004.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Error if apc.mmap_hugepage_size is not a power of 2
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.mmap_hugepage_size=1000
+apc.shm_size=2M
+--FILE--
+Irrelevant
+--EXPECTF--
+%A: apc.mmap_hugepage_size must be a power of 2 in Unknown on line 0
diff --git a/tests/apc_mmap_hugepage_005.phpt b/tests/apc_mmap_hugepage_005.phpt
new file mode 100644
index 00000000..d97294e7
--- /dev/null
+++ b/tests/apc_mmap_hugepage_005.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Error if apc.shm_size is not a multiple of apc.mmap_hugepage_size
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.mmap_hugepage_size=2M
+apc.shm_size=3M
+--FILE--
+Irrelevant
+--EXPECTF--
+%A: apc.shm_size must be a multiple of apc.mmap_hugepage_size in Unknown on line 0
diff --git a/tests/apc_mmap_hugepage_006.phpt b/tests/apc_mmap_hugepage_006.phpt
new file mode 100644
index 00000000..a5dc1105
--- /dev/null
+++ b/tests/apc_mmap_hugepage_006.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Error if apc.mmap_hugepage_size is too small
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.mmap_hugepage_size=1
+apc.shm_size=2M
+--FILE--
+Irrelevant
+--EXPECTF--
+%A: Invalid hugepage size: %d in Unknown on line 0
diff --git a/tests/apc_repeated_unpersist.phpt b/tests/apc_repeated_unpersist.phpt
new file mode 100644
index 00000000..da54ed82
--- /dev/null
+++ b/tests/apc_repeated_unpersist.phpt
@@ -0,0 +1,73 @@
+--TEST--
+APCU: Test that repeated unpersist does not break the persistence representation in SHM
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.serializer=default
+apc.shm_size=1M
+--FILE--
+ "val1", "prop2" => 2]);
+apcu_store("array_empty", []);
+apcu_store("array_simple", $tmp);
+apcu_store("array_nested", [$tmp]);
+apcu_store("array_referenced", [&$tmp, &$tmp]);
+
+echo "1st unpersist:\n";
+var_dump(apcu_fetch("int") === 123);
+var_dump(apcu_fetch("string") === "abc");
+var_dump(apcu_fetch("object") == (object) ["prop1" => "val1", "prop2" => 2]);
+var_dump(apcu_fetch("array_empty") === []);
+var_dump(apcu_fetch("array_simple") === $tmp);
+var_dump(apcu_fetch("array_nested") === [$tmp]);
+var_dump(apcu_fetch("array_referenced") === [&$tmp, &$tmp]);
+
+echo "2nd unpersist (check, if the 1st unpersist didn't break the representation in SHM):\n";
+var_dump(apcu_fetch("int") === 123);
+var_dump(apcu_fetch("string") === "abc");
+var_dump(apcu_fetch("object") == (object) ["prop1" => "val1", "prop2" => 2]);
+var_dump(apcu_fetch("array_empty") === []);
+var_dump(apcu_fetch("array_simple") === $tmp);
+var_dump(apcu_fetch("array_nested") === [$tmp]);
+var_dump(apcu_fetch("array_referenced") === [&$tmp, &$tmp]);
+
+echo "Check if the reference has been preserved:\n";
+$tmp = apcu_fetch("array_referenced");
+$tmp[0][0] = 2;
+$tmp[0][1] = "b";
+var_dump($tmp[1][0] === 2);
+var_dump($tmp[1][1] === "b");
+
+?>
+--EXPECT--
+1st unpersist:
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+2nd unpersist (check, if the 1st unpersist didn't break the representation in SHM):
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Check if the reference has been preserved:
+bool(true)
+bool(true)
diff --git a/tests/apc_soft_expired.phpt b/tests/apc_soft_expired.phpt
new file mode 100644
index 00000000..0fcfe9da
--- /dev/null
+++ b/tests/apc_soft_expired.phpt
@@ -0,0 +1,60 @@
+--TEST--
+apcu_inc/dec() should not inc/dec soft expired entries based on global TTL setting
+--SKIPIF--
+
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.use_request_time=1
+apc.ttl=2
+--FILE--
+
+--EXPECT--
+T+0:
+int(1)
+int(1)
+int(-1)
+int(-1)
+T+1:
+int(2)
+int(2)
+int(-2)
+int(-2)
+T+4:
+int(1)
+int(1)
+int(-1)
+int(-1)
diff --git a/tests/apcu_sma_info.phpt b/tests/apcu_sma_info.phpt
index bc246641..996bf726 100644
--- a/tests/apcu_sma_info.phpt
+++ b/tests/apcu_sma_info.phpt
@@ -3,7 +3,6 @@ Basic apcu_sma_info() test
--INI--
apc.enabled=1
apc.enable_cli=1
-apc.shm_segments=1
--FILE--
---CONFLICTS--
-server
---FILE--
-b->f();
- return array('b');
- }
-}
-
-
-class B{
- const A_CONSTANT = 1;
- public \$var;
-
- public function f(){
- \$this->var = self::A_CONSTANT;
- }
-}
-
-
-if(isset(\$_SESSION['lalala'])){
- echo "";
- \$a = \$_SESSION['lalala'];
- print_r(\$a);
-} else {
- echo "no session yet, first run\n";
-}
-
-// another file
-// class A and B use autoload
-\$b = new B();
-\$a = new A();
-\$a->b = \$b;
-
-\$_SESSION['lalala'] = \$a;
-session_write_close();
-FL;
-
-$args = array(
- 'apc.enabled=1',
- 'apc.cache_by_default=1',
- 'apc.enable_cli=1',
- 'session.gc_probability=0',
-);
-
-server_start($file, $args);
-
-$sid = md5(uniqid("call me maybe", true));
-for ($i = 0; $i < 10; $i++) {
- $send = "GET / HTTP/1.1\n" .
- "Host: " . PHP_CLI_SERVER_HOSTNAME . "\n" .
- "Cookie: PHPSESSID=$sid;" .
- "\r\n\r\n";
- for ($j = 0; $j < $num_servers; $j++) {
- run_test(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT+$j, $send);
- }
-}
-echo 'done';
---EXPECT--
-no session yet, first run
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-A Object
-(
- [b] => B Object
- (
- [var] => 1
- )
-
-)
-done
diff --git a/tests/get_included_files_inc1.inc b/tests/get_included_files_inc1.inc
deleted file mode 100644
index 344e300e..00000000
--- a/tests/get_included_files_inc1.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/tests/get_included_files_inc2.inc b/tests/get_included_files_inc2.inc
deleted file mode 100644
index 318eba00..00000000
--- a/tests/get_included_files_inc2.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/tests/get_included_files_inc3.inc b/tests/get_included_files_inc3.inc
deleted file mode 100644
index f666edf2..00000000
--- a/tests/get_included_files_inc3.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/tests/ghbug176.phpt b/tests/ghbug176.phpt
index 8b1dd05d..23649cf6 100644
--- a/tests/ghbug176.phpt
+++ b/tests/ghbug176.phpt
@@ -3,7 +3,7 @@ APC: GH Bug #176 preload_path segfaults with bad data
--SKIPIF--
diff --git a/tests/iterator_006.phpt b/tests/iterator_006.phpt
index d98b0383..b86831e9 100644
--- a/tests/iterator_006.phpt
+++ b/tests/iterator_006.phpt
@@ -5,7 +5,7 @@ APC: APCIterator formats
--INI--
apc.enabled=1
apc.enable_cli=1
-apc.user_entries_hint=4096
+apc.entries_hint=4096
--FILE--