Revert "apc_time: use monotonic clock if available"

This reverts commit eb28fe1. As reported in #451, this makes the timestamps used by apcu inconsistent with time(), which people may have reasonably relied on.
krakjoe · Oct 6, 2022 · 8c05c51 · 8c05c51
1 parent 5015af4
commit 8c05c51
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/apc_time.c b/apc_time.c
@@ -34,13 +34,7 @@ time_t apc_time(void)
 			APCG(request_time) = (time_t) sapi_get_request_time();
 		return APCG(request_time);
 	} else {
-#ifdef HAVE_CLOCK_GETTIME
-		struct timespec ts;
-		clock_gettime(CLOCK_MONOTONIC, &ts);
-		return ts.tv_sec;
-#else
 		return time(0);
-#endif
 	}
 }
 

diff --git a/config.m4 b/config.m4
@@ -200,7 +200,6 @@ if test "$PHP_APCU" != "no"; then
    fi
   fi
 
-  AC_CHECK_FUNCS(clock_gettime)
   AC_CHECK_FUNCS(sigaction)
   AC_CACHE_CHECK(for union semun, php_cv_semun,
   [

diff --git a/package.xml b/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.php.net/license">PHP License</license>
  <notes>
-- 
+- Revert use of monotonic clock for TTL (#451)
  </notes>
  <contents>
   <dir name="/">
-Original file line number
+Diff line change
@@ Expand Up / @@ -200,7 +200,6 @@ if test "$PHP_APCU" != "no"; then @@
        fi
       fi
-      AC_CHECK_FUNCS(clock_gettime)
       AC_CHECK_FUNCS(sigaction)
       AC_CACHE_CHECK(for union semun, php_cv_semun,
       [
@@ Expand Down @@