Replace time() in favor of zend_realtime_get()

marc-mabe · marc-mabe · commit 88ec4733690b · 2025-10-05T07:40:24.000+02:00
diff --git a/Zend/zend_time.c b/Zend/zend_time.c
@@ -33,7 +33,7 @@ ZEND_API void zend_realtime_spec(struct timespec *ts) {
 
 #else
 
-	ts->tv_sec  = time(NULL);
+	ts->tv_sec  = zend_realtime_get();
 	ts->tv_nsec = 0;
 
 #endif
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
@@ -24,10 +24,10 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <time.h>
 
 #include "zend.h"
 #include "zend_virtual_cwd.h"
+#include "zend_time.h"
 
 #ifdef ZEND_WIN32
 #include <io.h>
@@ -577,7 +577,7 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim
 		if (start && save && CWDG(realpath_cache_size_limit)) {
 			/* cache lookup for absolute path */
 			if (!*t) {
-				*t = time(0);
+				*t = zend_realtime_get();
 			}
 			if ((bucket = realpath_cache_find(path, len, *t)) != NULL) {
 				if (is_dir && !bucket->is_dir) {
diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c
@@ -19,7 +19,7 @@
 #include "php.h"
 #include "php_calendar.h"
 #include "sdncal.h"
-#include <time.h>
+#include "zend_time.h"
 
 #define SECS_PER_DAY (24 * 3600)
 
@@ -36,7 +36,7 @@ PHP_FUNCTION(unixtojd)
 	}
 
 	if (tl_is_null) {
-		ts = time(NULL);
+		ts = zend_realtime_get();
 	} else if (tl >= 0) {
 		ts = (time_t) tl;
 	} else {
diff --git a/ext/calendar/easter.c b/ext/calendar/easter.c
@@ -20,7 +20,7 @@
 #include "php.h"
 #include "php_calendar.h"
 #include "sdncal.h"
-#include <time.h>
+#include "zend_time.h"
 
 /**
  * If `gm` is true this will return the timestamp at midnight on Easter of the given year. If it is false this
@@ -43,9 +43,8 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, bool gm)
 
 	/* Default to the current year if year parameter is not given */
 	if (year_is_null) {
-		time_t a;
+		time_t a = zend_realtime_get();
 		struct tm b, *res;
-		time(&a);
 		res = php_localtime_r(&a, &b);
 		if (!res) {
 			year = 1900;
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -1108,7 +1108,7 @@ time_t ftp_mdtm(ftpbuf_t *ftp, const char *path, const size_t path_len)
 	tm.tm_isdst = -1;
 
 	/* figure out the GMT offset */
-	stamp = time(NULL);
+	stamp = zend_realtime_get();
 	gmt = php_gmtime_r(&stamp, &tmbuf);
 	if (!gmt) {
 		return -1;
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -48,6 +48,7 @@
 #include "zend_accelerator_hash.h"
 #include "zend_file_cache.h"
 #include "zend_system_id.h"
+#include "zend_time.h"
 #include "ext/pcre/php_pcre.h"
 #include "ext/standard/basic_functions.h"
 
@@ -73,9 +74,7 @@ typedef int gid_t;
 #include <lmcons.h>
 #endif
 
-#ifndef ZEND_WIN32
-# include <sys/time.h>
-#else
+#ifdef ZEND_WIN32
 # include <process.h>
 #endif
 
@@ -84,7 +83,6 @@ typedef int gid_t;
 #endif
 #include <fcntl.h>
 #include <signal.h>
-#include <time.h>
 
 #ifndef ZEND_WIN32
 # include <sys/types.h>
@@ -191,18 +189,6 @@ static void bzero_aligned(void *mem, size_t size)
 #endif
 }
 
-#ifdef ZEND_WIN32
-static time_t zend_accel_get_time(void)
-{
-	FILETIME now;
-	GetSystemTimeAsFileTime(&now);
-
-	return (time_t) ((((((__int64)now.dwHighDateTime) << 32)|now.dwLowDateTime) - 116444736000000000L)/10000000);
-}
-#else
-# define zend_accel_get_time() time(NULL)
-#endif
-
 static inline bool is_cacheable_stream_path(const char *filename)
 {
 	return memcmp(filename, "file://", sizeof("file://") - 1) == 0 ||
@@ -878,7 +864,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check)
 		}
 		if (!success) {
 			/* errno is not ESRCH or we ran out of tries to kill the locker */
-			ZCSG(force_restart_time) = time(NULL); /* restore forced restart request */
+			ZCSG(force_restart_time) = zend_realtime_get(); /* restore forced restart request */
 			/* cannot kill the locker, bail out with error */
 			zend_accel_error_noreturn(ACCEL_LOG_ERROR, "Cannot kill process %d!", mem_usage_check->l_pid);
 		}
@@ -915,6 +901,7 @@ static inline bool accel_is_inactive(void)
 	}
 #else
 	struct flock mem_usage_check;
+	time_t now;
 
 	mem_usage_check.l_type = F_WRLCK;
 	mem_usage_check.l_whence = SEEK_SET;
@@ -931,8 +918,8 @@ static inline bool accel_is_inactive(void)
 
 	if (ZCG(accel_directives).force_restart_timeout
 		&& ZCSG(force_restart_time)
-		&& time(NULL) >= ZCSG(force_restart_time)) {
-		zend_accel_error(ACCEL_LOG_WARNING, "Forced restart at %ld (after " ZEND_LONG_FMT " seconds), locked by %d", (long)time(NULL), ZCG(accel_directives).force_restart_timeout, mem_usage_check.l_pid);
+		&& (now = zend_realtime_get()) >= ZCSG(force_restart_time)) {
+		zend_accel_error(ACCEL_LOG_WARNING, "Forced restart at %lld (after " ZEND_LONG_FMT " seconds), locked by %d", (long long)now, ZCG(accel_directives).force_restart_timeout, mem_usage_check.l_pid);
 		kill_all_lockers(&mem_usage_check);
 
 		return false; /* next request should be able to restart it */
@@ -2936,7 +2923,7 @@ static zend_result zend_accel_init_shm(void)
 	ZCSG(manual_restarts) = 0;
 
 	ZCSG(accelerator_enabled) = true;
-	ZCSG(start_time) = zend_accel_get_time();
+	ZCSG(start_time) = zend_realtime_get();
 	ZCSG(last_restart_time) = 0;
 	ZCSG(restart_in_progress) = false;
 
@@ -3552,7 +3539,7 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason)
 	ZCSG(accelerator_enabled) = false;
 
 	if (ZCG(accel_directives).force_restart_timeout) {
-		ZCSG(force_restart_time) = zend_accel_get_time() + ZCG(accel_directives).force_restart_timeout;
+		ZCSG(force_restart_time) = zend_realtime_get() + ZCG(accel_directives).force_restart_timeout;
 	} else {
 		ZCSG(force_restart_time) = 0;
 	}
diff --git a/ext/opcache/zend_accelerator_debug.c b/ext/opcache/zend_accelerator_debug.c
@@ -22,10 +22,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <time.h>
 #ifdef ZEND_WIN32
 # include <process.h>
 #endif
+#include "zend_time.h"
 #include "ZendAccelerator.h"
 
 static void zend_accel_error_va_args(int type, const char *format, va_list args)
@@ -36,7 +36,7 @@ static void zend_accel_error_va_args(int type, const char *format, va_list args)
 
 	if (type <= ZCG(accel_directives).log_verbosity_level) {
 
-	timestamp = time(NULL);
+	timestamp = zend_realtime_get();
 	time_string = asctime(localtime(&timestamp));
 	time_string[24] = 0;
 
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -31,14 +31,12 @@
 #include "ext/standard/info.h"
 #include "zend_smart_str.h"
 #include "ext/pcre/php_pcre.h"
-#ifdef PHP_WIN32
-# include "win32/time.h"
-#endif
 #include "php_pgsql.h"
 #include "php_globals.h"
 #include "zend_exceptions.h"
 #include "zend_attributes.h"
 #include "zend_interfaces.h"
+#include "zend_time.h"
 #include "php_network.h"
 
 #ifdef HAVE_PGSQL
@@ -472,7 +470,7 @@ static int PQsocketPoll(int socket, int read, int write, time_t timeout)
 	}
 
 	if (timeout != (time_t)ts) {
-		time_t cur = time(NULL);
+		time_t cur = zend_realtime_get();
 
 		if (timeout > cur) {
 			ts = (timeout - cur) * 1000;
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
@@ -27,6 +27,7 @@
 #include "ext/standard/php_string.h" /* For php_stristr() */
 #include "ext/standard/info.h"
 #include "zend_smart_str.h"
+#include "zend_time.h"
 
 static void destroy_phar_data(zval *zv);
 
@@ -2973,7 +2974,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 			4: metadata-len
 			+: metadata
 		*/
-		mytime = time(NULL);
+		mytime = zend_realtime_get();
 		phar_set_32(entry_buffer, entry->uncompressed_filesize);
 		phar_set_32(entry_buffer+4, mytime);
 		phar_set_32(entry_buffer+8, entry->compressed_filesize);
diff --git a/ext/phar/stream.c b/ext/phar/stream.c
@@ -21,6 +21,7 @@
 #include "phar_internal.h"
 #include "stream.h"
 #include "dirstream.h"
+#include "zend_time.h"
 
 static const php_stream_ops phar_ops = {
 	phar_stream_write, /* write */
@@ -470,7 +471,7 @@ static int phar_stream_flush(php_stream *stream) /* {{{ */
 	phar_entry_data *data = (phar_entry_data *) stream->abstract;
 
 	if (data->internal_file->is_modified) {
-		data->internal_file->timestamp = time(0);
+		data->internal_file->timestamp = zend_realtime_get();
 		phar_flush(data->phar, &error);
 		if (error) {
 			php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS, "%s", error);
diff --git a/ext/phar/tar.c b/ext/phar/tar.c
@@ -19,6 +19,7 @@
 
 #include "phar_internal.h"
 #include "ext/standard/php_string.h" /* For php_stristr() */
+#include "zend_time.h"
 
 static uint32_t phar_tar_number(const char *buf, size_t len) /* {{{ */
 {
@@ -977,7 +978,7 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	char *buf, *signature, sigbuf[8];
 
 	entry.flags = PHAR_ENT_PERM_DEF_FILE;
-	entry.timestamp = time(NULL);
+	entry.timestamp = zend_realtime_get();
 	entry.is_modified = 1;
 	entry.is_crc_checked = 1;
 	entry.is_tar = 1;
diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -22,6 +22,7 @@
 #include "ext/hash/php_hash.h" /* Needed for PHP_HASH_API in ext/hash/php_hash_sha.h */
 #include "ext/hash/php_hash_sha.h"
 #include "ext/standard/md5.h"
+#include "zend_time.h"
 
 #ifdef PHAR_HAVE_OPENSSL
 /* OpenSSL includes */
@@ -700,7 +701,7 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, ch
 
 	phar_add_virtual_dirs(phar, path, path_len);
 	etemp.is_modified = 1;
-	etemp.timestamp = time(0);
+	etemp.timestamp = zend_realtime_get();
 	etemp.is_crc_checked = 1;
 	etemp.phar = phar;
 	etemp.filename = zend_string_init(path, path_len, false);
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
@@ -19,6 +19,7 @@
 #include "phar_internal.h"
 #include "ext/standard/crc32.h"
 #include "ext/standard/php_string.h" /* For php_stristr() */
+#include "zend_time.h"
 
 #define PHAR_GET_16(var) ((uint16_t)((((uint16_t)var[0]) & 0xff) | \
 	(((uint16_t)var[1]) & 0xff) << 8))
@@ -158,7 +159,7 @@ static time_t phar_zip_d2u_time(const char *cdtime, const char *cddate) /* {{{ *
 	struct tm *tm, tmbuf;
 	time_t now;
 
-	now = time(NULL);
+	now = zend_realtime_get();
 	tm = php_localtime_r(&now, &tmbuf);
 
 	tm->tm_year = ((ddate>>9)&127) + 1980 - 1900;
@@ -1273,7 +1274,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 
 	pass.error = &temperr;
 	entry.flags = PHAR_ENT_PERM_DEF_FILE;
-	entry.timestamp = time(NULL);
+	entry.timestamp = zend_realtime_get();
 	entry.is_modified = 1;
 	entry.is_zip = true;
 	entry.phar = phar;
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
@@ -66,7 +66,6 @@
 #ifdef PHP_WIN32
 #include "win32/readdir.h"
 #endif
-#include <time.h>
 
 #include <fcntl.h>
 #include <errno.h>
@@ -75,6 +74,7 @@
 #include <unistd.h>
 #endif
 
+#include "zend_time.h"
 #include "php_session.h"
 #include "mod_files.h"
 #include "ext/standard/flock_compat.h"
@@ -292,7 +292,7 @@ static int ps_files_cleanup_dir(const zend_string *dirname, zend_long maxlifetim
 		return -1;
 	}
 
-	time(&now);
+	now = zend_realtime_get();
 
 	if (ZSTR_LEN(dirname) >= MAXPATHLEN) {
 		php_error_docref(NULL, E_NOTICE, "ps_files_cleanup_dir: dirname(%s) is too long", ZSTR_VAL(dirname));
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
@@ -20,12 +20,12 @@
 
 #include <unistd.h>
 #include <mm.h>
-#include <time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdint.h>
 
+#include "zend_time.h"
 #include "php_session.h"
 #include "mod_mm.h"
 #include "SAPI.h"
@@ -406,7 +406,7 @@ PS_WRITE_FUNC(mm)
 		if (sd) {
 			sd->datalen = val->len;
 			memcpy(sd->data, val->val, val->len);
-			time(&sd->ctime);
+			sd->ctime = zend_realtime_get();
 		}
 	}
 
@@ -442,9 +442,7 @@ PS_GC_FUNC(mm)
 	*nrdels = 0;
 	ps_mm_debug(("gc\n"));
 
-	time(&limit);
-
-	limit -= maxlifetime;
+	limit = zend_realtime_get() - maxlifetime;
 
 	mm_lock(data->mm, MM_LOCK_RW);
 
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -3261,7 +3261,7 @@ static zend_result php_session_rfc1867_callback(unsigned int event, void *event_
 			add_assoc_long_ex(&progress->current_file, ZEND_STRL("error"), 0);
 
 			add_assoc_bool_ex(&progress->current_file, ZEND_STRL("done"), 0);
-			add_assoc_long_ex(&progress->current_file, ZEND_STRL("start_time"), (zend_long)time(NULL));
+			add_assoc_long_ex(&progress->current_file, ZEND_STRL("start_time"), (zend_long)zend_realtime_get());
 			add_assoc_long_ex(&progress->current_file, ZEND_STRL("bytes_processed"), 0);
 
 			add_next_index_zval(&progress->files, &progress->current_file);
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
diff --git a/ext/standard/info.c b/ext/standard/info.c
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
diff --git a/main/main.c b/main/main.c
diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c
diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
diff --git a/win32/sendmail.c b/win32/sendmail.c
