Add $ttl argument to apcu_inc() and apcu_dec()

This if the TTL that will be used when apcu_inc/apcu_dec are called
on a non-existing (or hard expired) entry.

apc_arginfo.h

@@ -58,6 +58,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_apcu_inc, 0, 0, 1)
 	ZEND_ARG_INFO(0, key)
 	ZEND_ARG_INFO(0, step)
 	ZEND_ARG_INFO(1, success)
+	ZEND_ARG_INFO(0, ttl)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO(arginfo_apcu_cas, 0)

apc_cache.c

@@ -920,7 +920,7 @@ PHP_APCU_API zend_bool apc_cache_exists(apc_cache_t* cache, zend_string *key, ti
 /* {{{ apc_cache_update */
 PHP_APCU_API zend_bool apc_cache_update(
 		apc_cache_t *cache, zend_string *key, apc_cache_updater_t updater, void *data,
-		zend_bool insert_if_not_found)
+		zend_bool insert_if_not_found, zend_long ttl)
 {
 	apc_cache_entry_t **entry;
 
@@ -990,8 +990,7 @@ PHP_APCU_API zend_bool apc_cache_update(
 		/* We do not check the return value of the exclusive-store (add), as the entry might have
 		 * been added between the cache unlock and the store call. In this case we just want to
 		 * update the entry created by a different process. */
-		/* TODO Always uses TTL 0 */
-		apc_cache_store(cache, key, &val, 0, 1);
+		apc_cache_store(cache, key, &val, ttl, 1);
 
 		/* Only attempt to perform insertion once. */
 		insert_if_not_found = 0;

apc_cache_api.h

@@ -156,7 +156,7 @@ PHP_APCU_API zend_bool apc_cache_store(
 */
 PHP_APCU_API zend_bool apc_cache_update(
 		apc_cache_t *cache, zend_string *key, apc_cache_updater_t updater, void *data,
-		zend_bool insert_if_not_found);
+		zend_bool insert_if_not_found, zend_long ttl);
 
 /*
  * apc_cache_find searches for a cache entry by its hashed identifier,

package.xml

@@ -46,7 +46,8 @@
  - Respect TTL when calculating APCuIterator totals.
  - The per-entry TTL now always takes precedence over the global TTL.
  - The global TTL is now always relative to the access time.
- - apc_inc() and apc_dec() no longer update hard-expired entries. Instead a new entry is created.
+ - apcu_inc() and apcu_dec() no longer update hard-expired entries. Instead a new entry is created.
+ - Added optional $ttl argument to apcu_inc() and apcu_dec(), used when creating a new entry.
  - PHP bug #76145: Fix use of APCu inside Serializer::(un)serialize().
  - gh#304: If apcu_cas() is used on a non-existing entry, don't insert it.
  - gh#295: Improve APCuIterator performance by using PCRE JIT and preallocating key strings.

php_apc.c

@@ -415,7 +415,8 @@ PHP_FUNCTION(apcu_sma_info)
 
 /* {{{ php_apc_update  */
 int php_apc_update(
-		zend_string *key, apc_cache_updater_t updater, void *data, zend_bool insert_if_not_found)
+		zend_string *key, apc_cache_updater_t updater, void *data,
+		zend_bool insert_if_not_found, time_t ttl)
 {
 	if (!APCG(enabled)) {
 		return 0;
@@ -426,7 +427,7 @@ int php_apc_update(
 		apc_cache_serializer(apc_user_cache, APCG(serializer_name));
 	}
 
-	if (!apc_cache_update(apc_user_cache, key, updater, data, insert_if_not_found)) {
+	if (!apc_cache_update(apc_user_cache, key, updater, data, insert_if_not_found, ttl)) {
 		return 0;
 	}
 
@@ -530,15 +531,15 @@ static zend_bool php_inc_updater(apc_cache_t* cache, apc_cache_entry_t* entry, v
 	return 0;
 }
 
-/* {{{ proto long apcu_inc(string key [, long step [, bool& success]])
+/* {{{ 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;
-	zend_long step = 1;
+	zend_long step = 1, ttl = 0;
 	zval *success = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|lz", &key, &step, &success) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|lzl", &key, &step, &success, &ttl) == FAILURE) {
 		return;
 	}
 
@@ -549,7 +550,7 @@ PHP_FUNCTION(apcu_inc) {
 
 	ZVAL_LONG(&args.step, step);
 
-	if (php_apc_update(key, php_inc_updater, &args, 1)) {
+	if (php_apc_update(key, php_inc_updater, &args, 1, ttl)) {
 		if (success) {
 			ZVAL_TRUE(success);
 		}
@@ -564,15 +565,15 @@ PHP_FUNCTION(apcu_inc) {
 }
 /* }}} */
 
-/* {{{ proto long apcu_dec(string key [, long step [, bool &success]])
+/* {{{ 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;
-	zend_long step = 1;
+	zend_long step = 1, ttl = 0;
 	zval *success = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|lz", &key, &step, &success) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|lzl", &key, &step, &success, &ttl) == FAILURE) {
 		return;
 	}
 
@@ -583,7 +584,7 @@ PHP_FUNCTION(apcu_dec) {
 
 	ZVAL_LONG(&args.step, 0 - step);
 
-	if (php_apc_update(key, php_inc_updater, &args, 1)) {
+	if (php_apc_update(key, php_inc_updater, &args, 1, ttl)) {
 		if (success) {
 			ZVAL_TRUE(success);
 		}
@@ -626,7 +627,7 @@ PHP_FUNCTION(apcu_cas) {
 		return;
 	}
 
-	if (php_apc_update(key, php_cas_updater, &vals, 0)) {
+	if (php_apc_update(key, php_cas_updater, &vals, 0, 0)) {
 		RETURN_TRUE;
 	}
 

tests/apc_022.phpt

@@ -0,0 +1,46 @@
+--TEST--
+apcu_inc/dec() TTL parameter
+--SKIPIF--
+<?php
+require_once(__DIR__ . '/skipif.inc');
+if (!function_exists('apcu_inc_request_time')) die('skip APC debug build required');
+?>
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.use_request_time=1
+apc.ttl=0
+--FILE--
+<?php
+
+$ttl = 1;
+apcu_store("a", 0, $ttl);
+apcu_store("b", 0, $ttl);
+
+for ($i = 0; $i < 6; $i++) {
+    echo "T+$i:\n";
+    var_dump(apcu_inc("a"));
+    var_dump(apcu_inc("b", 1, $success, $ttl));
+    apcu_inc_request_time(1);
+}
+
+?>
+--EXPECT--
+T+0:
+int(1)
+int(1)
+T+1:
+int(2)
+int(2)
+T+2:
+int(1)
+int(1)
+T+3:
+int(2)
+int(2)
+T+4:
+int(3)
+int(1)
+T+5:
+int(4)
+int(2)