Replace php_time() with zend_realtime_get()

Author: marc-mabe

ext/date/php_date.c

@@ -49,11 +49,6 @@ static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i;
 #define DATE_A64I(i, s) i = strtoll(s, NULL, 10)
 #endif
 
-PHPAPI time_t php_time(void)
-{
-	return time(NULL);
-}
-
 /*
  * RFC822, Section 5.1: http://www.ietf.org/rfc/rfc822.txt
  *  date-time   =  [ day "," ] date time        ; dd mm yy hh:mm:ss zzz
@@ -852,7 +847,7 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, bool localtime)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ts_is_null) {
-		ts = php_time();
+		ts = zend_realtime_get(NULL, NULL);
 	}
 
 	RETURN_STR(php_format_date(ZSTR_VAL(format), ZSTR_LEN(format), ts, localtime));
@@ -1016,7 +1011,7 @@ PHP_FUNCTION(idate)
 	}
 
 	if (ts_is_null) {
-		ts = php_time();
+		ts = zend_realtime_get(NULL, NULL);
 	}
 
 	ret = php_idate(ZSTR_VAL(format)[0], ts, 0);
@@ -1096,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) php_time());
+		!preset_ts_is_null ? (timelib_sll) preset_ts : (timelib_sll) zend_realtime_get(NULL, NULL));
 
 	t = timelib_strtotime(ZSTR_VAL(times), ZSTR_LEN(times), &error,
 		DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
@@ -1147,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) php_time());
+		timelib_unixtime2gmt(now, (timelib_sll) zend_realtime_get(NULL, NULL));
 	} else {
 		tzi = get_timezone_info();
 		if (!tzi) {
 			return;
 		}
 		now->tz_info = tzi;
 		now->zone_type = TIMELIB_ZONETYPE_ID;
-		timelib_unixtime2local(now, (timelib_sll) php_time());
+		timelib_unixtime2local(now, (timelib_sll) zend_realtime_get(NULL, NULL));
 	}
 
 	now->h = hou;
@@ -1265,7 +1260,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, bool gmt)
 	}
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) php_time();
+		timestamp = (zend_long) zend_realtime_get(NULL, NULL);
 	}
 
 	ts = timelib_time_ctor();
@@ -1361,7 +1356,7 @@ PHP_FUNCTION(time)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	RETURN_LONG((zend_long)php_time());
+	RETURN_LONG((zend_long) zend_realtime_get(NULL, NULL));
 }
 /* }}} */
 
@@ -1381,7 +1376,7 @@ PHP_FUNCTION(localtime)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) php_time();
+		timestamp = (zend_long) zend_realtime_get(NULL, NULL);
 	}
 
 	tzi = get_timezone_info();
@@ -1436,7 +1431,7 @@ PHP_FUNCTION(getdate)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) php_time();
+		timestamp = (zend_long) zend_realtime_get(NULL, NULL);
 	}
 
 	tzi = get_timezone_info();
@@ -2338,9 +2333,11 @@ static void php_date_set_time_fraction(timelib_time *time, int microsecond)
 
 static void php_date_get_current_time_with_fraction(time_t *sec, suseconds_t *usec)
 {
-	long nsec;
-	zend_realtime_get(sec, &nsec);
-	*usec = nsec / 1000;
+	struct timespec ts;
+
+	zend_realtime_spec(&ts);
+	*sec = ts.tv_sec;
+	*usec = ts.tv_nsec / 1000;
 }
 
 PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, size_t time_str_len, const char *format, zval *timezone_object, int flags) /* {{{ */

ext/date/php_date.h

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

ext/standard/head.c

@@ -21,7 +21,7 @@
 #include "SAPI.h"
 #include "php_main.h"
 #include "head.h"
-#include <time.h>
+#include "zend_time.h"
 
 #include "php_globals.h"
 #include "zend_smart_str.h"
@@ -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, php_time());
+			diff = difftime(expires, zend_realtime_get(NULL, NULL));
 			if (diff < 0) {
 				diff = 0;
 			}