Allow all entries to be soft_expired

.github/workflows/config.yml

@@ -4,9 +4,11 @@ jobs:
   ubuntu:
     strategy:
       matrix:
-          version: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
+          version: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
     runs-on: ubuntu-latest
     steps:
+      - name: Set the hugepages parameter
+        run: sudo sh -c "echo 1 > /proc/sys/vm/nr_hugepages"
       - name: Checkout apcu
         uses: actions/checkout@v4
       - name: Setup PHP
@@ -17,6 +19,8 @@ jobs:
         run: phpize
       - name: configure
         run: ./configure --enable-apcu-debug
+      - name: Fix missing PHP_EXECUTABLE in Makefile for PHP 7.x
+        run: sed -i -e 's/^PHP_EXECUTABLE = NONE$/PHP_EXECUTABLE = \/usr\/bin\/php/' Makefile
       - name: make
         run: make
       - name: test
@@ -31,28 +35,16 @@ jobs:
         shell: cmd
     strategy:
       matrix:
-        version: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
+        version: ["8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]
         arch: [x64]
         ts: [nts, ts]
-        os: [windows-2019, windows-2022]
-        exclude:
-          - { os: windows-2019, version: "8.4" }
-          - { os: windows-2019, version: "8.3" }
-          - { os: windows-2019, version: "8.2" }
-          - { os: windows-2019, version: "8.1" }
-          - { os: windows-2019, version: "8.0" }
-          - { os: windows-2022, version: "7.4" }
-          - { os: windows-2022, version: "7.3" }
-          - { os: windows-2022, version: "7.2" }
-          - { os: windows-2022, version: "7.1" }
-          - { os: windows-2022, version: "7.0" }
-    runs-on: ${{matrix.os}}
+    runs-on: windows-2022
     steps:
       - name: Checkout apcu
         uses: actions/checkout@v4
       - name: Setup PHP
         id: setup-php
-        uses: php/setup-php-sdk@v0.10
+        uses: php/setup-php-sdk@v0.11
         with:
           version: ${{matrix.version}}
           arch: ${{matrix.arch}}

apc.c

@@ -34,7 +34,7 @@
 #include "apc_globals.h"
 #include "php.h"
 
-/* {{{ console display functions */
+/* console display functions */
 #define APC_PRINT_FUNCTION(name, verbosity)					\
 	void apc_##name(const char *format, ...)				\
 	{									\
@@ -54,9 +54,7 @@ APC_PRINT_FUNCTION(debug, E_NOTICE)
 #else
 void apc_debug(const char *format, ...) {}
 #endif
-/* }}} */
 
-/* {{{ apc_flip_hash */
 HashTable* apc_flip_hash(HashTable *hash) {
 	zval data, *entry;
 	HashTable *new_hash;
@@ -79,7 +77,6 @@ HashTable* apc_flip_hash(HashTable *hash) {
 
 	return new_hash;
 }
-/* }}} */
 
 /*
 * Serializer API
@@ -88,9 +85,7 @@ HashTable* apc_flip_hash(HashTable *hash) {
 
 /* pointer to the list of serializers */
 static apc_serializer_t apc_serializers[APC_MAX_SERIALIZERS] = {{0,}};
-/* }}} */
 
-/* {{{ apc_register_serializer */
 PHP_APCU_API int _apc_register_serializer(
         const char* name, apc_serialize_t serialize, apc_unserialize_t unserialize, void *config) {
 	int i;
@@ -112,14 +107,12 @@ PHP_APCU_API int _apc_register_serializer(
 	}
 
 	return 0;
-} /* }}} */
+}
 
-/* {{{ apc_get_serializers */
 PHP_APCU_API apc_serializer_t* apc_get_serializers()  {
 	return &(apc_serializers[0]);
-} /* }}} */
+}
 
-/* {{{ apc_find_serializer */
 PHP_APCU_API apc_serializer_t* apc_find_serializer(const char* name) {
 	int i;
 	apc_serializer_t *serializer;
@@ -131,7 +124,7 @@ PHP_APCU_API apc_serializer_t* apc_find_serializer(const char* name) {
 		}
 	}
 	return NULL;
-} /* }}} */
+}
 
 /*
  * Local variables:

apc.h

@@ -107,32 +107,26 @@ PHP_APCU_API HashTable* apc_flip_hash(HashTable *hash);
 typedef int (*apc_serialize_t)(APC_SERIALIZER_ARGS);
 typedef int (*apc_unserialize_t)(APC_UNSERIALIZER_ARGS);
 
-/* {{{ struct definition: apc_serializer_t */
 typedef struct apc_serializer_t {
 	const char*        name;
 	apc_serialize_t    serialize;
 	apc_unserialize_t  unserialize;
 	void*              config;
 } apc_serializer_t;
-/* }}} */
 
-/* {{{ _apc_register_serializer
- registers the serializer using the given name and parameters */
+/* registers the serializer using the given name and parameters */
 PHP_APCU_API int _apc_register_serializer(
         const char* name, apc_serialize_t serialize, apc_unserialize_t unserialize, void *config);
-/* }}} */
 
-/* {{{ apc_get_serializers
- fetches the list of serializers */
-PHP_APCU_API apc_serializer_t* apc_get_serializers(void); /* }}} */
+/* fetches the list of serializers */
+PHP_APCU_API apc_serializer_t* apc_get_serializers(void);
 
-/* {{{ apc_find_serializer
- finds a previously registered serializer by name */
-PHP_APCU_API apc_serializer_t* apc_find_serializer(const char* name); /* }}} */
+/* finds a previously registered serializer by name */
+PHP_APCU_API apc_serializer_t* apc_find_serializer(const char* name);
 
-/* {{{ default serializers */
+/* default serializers */
 PHP_APCU_API int APC_SERIALIZER_NAME(php) (APC_SERIALIZER_ARGS);
-PHP_APCU_API int APC_UNSERIALIZER_NAME(php) (APC_UNSERIALIZER_ARGS); /* }}} */
+PHP_APCU_API int APC_UNSERIALIZER_NAME(php) (APC_UNSERIALIZER_ARGS);
 
 #define php_apc_try                        \
 {                                          \

apc.php

@@ -766,6 +766,8 @@ function block_sort($array1, $array2)
     $insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts'])/$elapsed) : 0);
     $apcversion = phpversion('apcu');
     $phpversion = phpversion();
+    $cleanups = $cache['cleanups'] ?? '-';
+    $defragmentations = $cache['defragmentations'] ?? '-';
     $number_vars = $cache['num_entries'];
     $size_vars = bsize($cache['mem_size']);
     $num_hits_and_misses = $cache['num_hits'] + $cache['num_misses'];
@@ -804,6 +806,8 @@ function block_sort($array1, $array2)
             <tr class=tr-0><td class=td-0>Hit Rate</td><td>$hit_rate_user cache requests/second</td></tr>
             <tr class=tr-1><td class=td-0>Miss Rate</td><td>$miss_rate_user cache requests/second</td></tr>
             <tr class=tr-0><td class=td-0>Insert Rate</td><td>$insert_rate_user cache requests/second</td></tr>
+            <tr class=tr-1><td class=td-0>Cache cleanup count</td><td>$cleanups</td></tr>
+            <tr class=tr-0><td class=td-0>Cache defragmentation count</td><td>$defragmentations</td></tr>
             <tr class=tr-1><td class=td-0>Cache full count</td><td>{$cache['expunges']}</td></tr>
         </tbody>
         </table>