Convert zend_realtime_get() to be a macro wrapper around time(NULL)

Author: marc-mabe

Zend/zend_time.c

@@ -16,44 +16,6 @@
 
 #include "zend_time.h"
 
-ZEND_API time_t zend_realtime_get(time_t *sec, long *nsec) {
-	if (!nsec) {
-		return time(sec);
-	}
-
-#if defined(HAVE_CLOCK_GETTIME)
-
-	struct timespec ts;
-	clock_gettime(CLOCK_REALTIME, &ts);
-	if (sec) *sec  = ts.tv_sec;
-	*nsec = ts.tv_nsec;
-	return ts.tv_sec;
-
-#elif defined(HAVE_TIMESPEC_GET)
-
-	struct timespec ts;
-	timespec_get(&ts, TIME_UTC);
-	if (sec) *sec  = ts.tv_sec;
-	*nsec = ts.tv_nsec;
-	return ts.tv_sec;
-
-#elif defined(HAVE_GETTIMEOFDAY)
-
-	struct timeval tv;
-	gettimeofday(&tv, NULL);
-
-	if (sec) *sec  = tv.tv_sec;
-	*nsec = tv.tv_usec * 1000;
-	return tv.tv_sec;
-
-#else
-
-	*nsec = 0;
-	return time(sec);
-
-#endif
-}
-
 ZEND_API void zend_realtime_spec(struct timespec *ts) {
 #if defined(HAVE_CLOCK_GETTIME)
 

Zend/zend_time.h

@@ -62,8 +62,8 @@
 
 BEGIN_EXTERN_C()
 
-/* Like time() but with up to nanosecond */
-ZEND_API time_t zend_realtime_get(time_t *sec, long *nsec);
+/* Helper macro to get current timestamp in seconds */
+#define zend_realtime_get() time(NULL)
 
 /* wrapper around clock_gettime/timestamp_get/gettimeofday/time */
 ZEND_API void zend_realtime_spec(struct timespec *ts);

ext/date/php_date.c

@@ -847,7 +847,7 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, bool localtime)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ts_is_null) {
-		ts = zend_realtime_get(NULL, NULL);
+		ts = zend_realtime_get();
 	}
 
 	RETURN_STR(php_format_date(ZSTR_VAL(format), ZSTR_LEN(format), ts, localtime));
@@ -1011,7 +1011,7 @@ PHP_FUNCTION(idate)
 	}
 
 	if (ts_is_null) {
-		ts = zend_realtime_get(NULL, NULL);
+		ts = zend_realtime_get();
 	}
 
 	ret = php_idate(ZSTR_VAL(format)[0], ts, 0);
@@ -1091,7 +1091,7 @@ PHP_FUNCTION(strtotime)
 	now->tz_info = tzi;
 	now->zone_type = TIMELIB_ZONETYPE_ID;
 	timelib_unixtime2local(now,
-		!preset_ts_is_null ? (timelib_sll) preset_ts : (timelib_sll) zend_realtime_get(NULL, NULL));
+		!preset_ts_is_null ? (timelib_sll) preset_ts : (timelib_sll) zend_realtime_get());
 
 	t = timelib_strtotime(ZSTR_VAL(times), ZSTR_LEN(times), &error,
 		DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
@@ -1142,15 +1142,15 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, bool gmt)
 	/* Initialize structure with current time */
 	now = timelib_time_ctor();
 	if (gmt) {
-		timelib_unixtime2gmt(now, (timelib_sll) zend_realtime_get(NULL, NULL));
+		timelib_unixtime2gmt(now, (timelib_sll) zend_realtime_get());
 	} else {
 		tzi = get_timezone_info();
 		if (!tzi) {
 			return;
 		}
 		now->tz_info = tzi;
 		now->zone_type = TIMELIB_ZONETYPE_ID;
-		timelib_unixtime2local(now, (timelib_sll) zend_realtime_get(NULL, NULL));
+		timelib_unixtime2local(now, (timelib_sll) zend_realtime_get());
 	}
 
 	now->h = hou;
@@ -1260,7 +1260,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, bool gmt)
 	}
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) zend_realtime_get(NULL, NULL);
+		timestamp = (zend_long) zend_realtime_get();
 	}
 
 	ts = timelib_time_ctor();
@@ -1356,7 +1356,7 @@ PHP_FUNCTION(time)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	RETURN_LONG((zend_long) zend_realtime_get(NULL, NULL));
+	RETURN_LONG((zend_long) zend_realtime_get());
 }
 /* }}} */
 
@@ -1376,7 +1376,7 @@ PHP_FUNCTION(localtime)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) zend_realtime_get(NULL, NULL);
+		timestamp = (zend_long) zend_realtime_get();
 	}
 
 	tzi = get_timezone_info();
@@ -1431,7 +1431,7 @@ PHP_FUNCTION(getdate)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) zend_realtime_get(NULL, NULL);
+		timestamp = (zend_long) zend_realtime_get();
 	}
 
 	tzi = get_timezone_info();

ext/date/php_date.h

@@ -129,8 +129,8 @@ ZEND_END_MODULE_GLOBALS(date)
 
 #define DATEG(v) ZEND_MODULE_GLOBALS_ACCESSOR(date, v)
 
-/* DEPRECATED, use zend_realtime_get(NULL, NULL) instead */
-#define php_time() zend_realtime_get(NULL, NULL)
+/* DEPRECATED, use zend_realtime_get() instead */
+#define php_time() zend_realtime_get()
 
 /* Backwards compatibility wrapper */
 PHPAPI zend_long php_parse_date(const char *string, zend_long *now);

ext/openssl/xp_ssl.c

@@ -1079,7 +1079,7 @@ static void php_openssl_limit_handshake_reneg(const SSL *ssl) /* {{{ */
 
 	stream = php_openssl_get_stream_from_ssl_handle(ssl);
 	sslsock = (php_openssl_netstream_data_t*)stream->abstract;
-	now = (zend_long)zend_realtime_get(NULL, NULL);
+	now = (zend_long)zend_realtime_get();
 
 	/* The initial handshake is never rate-limited */
 	if (sslsock->reneg->prev_handshake == 0) {

ext/session/session.c

@@ -1262,7 +1262,7 @@ CACHE_LIMITER_FUNC(public)
 	time_t expire_at;
 
 
-	expire_at = zend_realtime_get(NULL, NULL) + PS(cache_expire) * 60;
+	expire_at = zend_realtime_get() + PS(cache_expire) * 60;
 	memcpy(buf, EXPIRES, sizeof(EXPIRES) - 1);
 	strcpy_gmt(buf + sizeof(EXPIRES) - 1, &expire_at);
 	ADD_HEADER(buf);
@@ -1385,7 +1385,7 @@ static zend_result php_session_send_cookie(void)
 	if (PS(cookie_lifetime) > 0) {
 		time_t t;
 
-		t = zend_realtime_get(NULL, NULL) + PS(cookie_lifetime);
+		t = zend_realtime_get() + PS(cookie_lifetime);
 
 		if (t > 0) {
 			date_fmt = php_format_date(ZEND_STRL("D, d M Y H:i:s \\G\\M\\T"), t, false);

ext/standard/head.c

@@ -155,7 +155,7 @@ PHPAPI zend_result php_setcookie(zend_string *name, zend_string *value, time_t e
 			smart_str_append(&buf, dt);
 			zend_string_free(dt);
 
-			diff = difftime(expires, zend_realtime_get(NULL, NULL));
+			diff = difftime(expires, zend_realtime_get());
 			if (diff < 0) {
 				diff = 0;
 			}

ext/standard/uniqid.c

@@ -30,8 +30,8 @@
 #include "ext/random/php_random.h"
 #include "ext/random/php_random_csprng.h"
 
-ZEND_TLS time_t prev_sec  = 0;
-ZEND_TLS long   prev_usec = 0;
+ZEND_TLS time_t prev_tv_sec  = 0;
+ZEND_TLS long   prev_tv_usec = 0;
 
 /* {{{ Generates a unique ID */
 PHP_FUNCTION(uniqid)
@@ -40,8 +40,8 @@ PHP_FUNCTION(uniqid)
 	bool more_entropy = 0;
 	zend_string *uniqid;
 	size_t prefix_len = 0;
-	time_t sec;
-	long nsec, usec;
+	struct timespec ts;
+	long tv_usec;
 	int isec, iusec;
 
 	ZEND_PARSE_PARAMETERS_START(0, 2)
@@ -56,15 +56,15 @@ PHP_FUNCTION(uniqid)
 	 * another process, causing a pause of around 10ms.
 	 */
 	do {
-		zend_realtime_get(&sec, &nsec);
-		usec = nsec / 1000;
-	} while (sec == prev_sec && usec == prev_usec);
+		zend_realtime_spec(&ts);
+		tv_usec = ts.tv_nsec / 1000;
+	} while (ts.tv_sec == prev_tv_sec && tv_usec == prev_tv_usec);
 
-	prev_sec  = sec;
-	prev_usec = usec;
+	prev_tv_sec  = ts.tv_sec;
+	prev_tv_usec = tv_usec;
 
-	isec  = (int) sec;
-	iusec = (int) (usec % 0x100000);
+	isec  = (int) ts.tv_sec;
+	iusec = (int) (tv_usec % 0x100000);
 
 	/* The max value usec can have is 0xF423F, so we use only five hex
 	 * digits for usecs.

sapi/cli/php_cli_server.c

@@ -269,7 +269,7 @@ static bool php_cli_server_get_system_time(char *buf) {
 	time_t sec;
 	struct tm tm;
 
-	zend_realtime_get(&sec, NULL);
+	sec = zend_realtime_get();
 	if (!php_localtime_r(&sec, &tm)) {
 		return false;
 	}
@@ -385,7 +385,7 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
 		zend_string *dt = php_format_date(
 			"D, d M Y H:i:s",
 			sizeof("D, d M Y H:i:s") - 1,
-			zend_realtime_get(NULL, NULL),
+			zend_realtime_get(),
 			0
 		);
 		smart_str_appends_ex(buffer, "Date: ", persistent);

sapi/fpm/fpm/fpm_log.c

@@ -128,7 +128,7 @@ int fpm_log_write(char *log_format) /* {{{ */
 		test = true;
 	}
 
-	now_epoch = zend_realtime_get(NULL, NULL);
+	now_epoch = zend_realtime_get();
 
 	if (!test) {
 		scoreboard = fpm_scoreboard_get();