Revert "apc_time: use monotonic clock if available"

nikic · nikic · commit 8c05c515b698 · 2022-10-06T21:17:43.000+02:00
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.
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 number	Diff line change
`@@ -34,13 +34,7 @@ time_t apc_time(void)`
`34`	`34`	`APCG(request_time) = (time_t) sapi_get_request_time();`
`35`	`35`	`return APCG(request_time);`
`36`	`36`	`} else {`
`37`		`-#ifdef HAVE_CLOCK_GETTIME`
`38`		`- struct timespec ts;`
`39`		`- clock_gettime(CLOCK_MONOTONIC, &ts);`
`40`		`- return ts.tv_sec;`
`41`		`-#else`
`42`	`37`	`return time(0);`
`43`		`-#endif`
`44`	`38`	`}`
`45`	`39`	`}`
`46`	`40`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,6 @@ if test "$PHP_APCU" != "no"; then`
`200`	`200`	`fi`
`201`	`201`	`fi`
`202`	`202`
`203`		`- AC_CHECK_FUNCS(clock_gettime)`
`204`	`203`	`AC_CHECK_FUNCS(sigaction)`
`205`	`204`	`AC_CACHE_CHECK(for union semun, php_cv_semun,`
`206`	`205`	`[`