Addressed PR comments

Author: marc-mabe

Zend/zend_time.c

@@ -40,45 +40,86 @@
 #define ZEND_MILLI_IN_SEC 1000U
 #define ZEND_MICRO_IN_SEC 1000000U
 
-/* Helper macro to assign seconds to timeval */
-#define zend_time_sec2val(s, tv) \
-	(tv).tv_sec  = (tv_sec_t) (s); \
-	(tv).tv_usec = 0;
-
-/* Helper macro to assign microseconds to timeval */
-#define zend_time_usec2val(usec, tv) \
-	(tv).tv_sec  = (tv_sec_t) ((usec) / ZEND_MICRO_IN_SEC); \
-	(tv).tv_usec = (tv_usec_t) ((usec) % ZEND_MICRO_IN_SEC);
-
-/* Helper macro to assign double (seconds) to timeval */
-#define zend_time_dbl2val(d, tv) \
-	(tv).tv_sec  = (tv_sec_t) (d); \
-	(tv).tv_usec = (tv_usec_t) (((d) - (tv).tv_sec) * ZEND_MICRO_IN_SEC);
-
-/* Helper macro to copy timeval to timespec */
-#define zend_time_val2spec(tv, ts) \
-	(ts).tv_sec  = (time_t) (tv).tv_sec; \
-	(ts).tv_nsec = (long) ((tv).tv_usec * 1000);
-
 BEGIN_EXTERN_C()
 
-/* Helper macro to get current timestamp in seconds */
-#define zend_realtime_get() time(NULL)
+/* Assign seconds to timeval */
+static zend_always_inline void zend_time_sec2val(time_t s, struct timeval *tv) {
+	tv->tv_sec  = (tv_sec_t) s;
+	tv->tv_usec = 0;
+}
+
+/* Assign microseconds to timeval */
+static zend_always_inline void zend_time_usec2val(int64_t usec, struct timeval *tv) {
+	tv->tv_sec  = (tv_sec_t) (usec / ZEND_MICRO_IN_SEC);
+	tv->tv_usec = (tv_usec_t) (usec % ZEND_MICRO_IN_SEC);
+
+	if (UNEXPECTED(tv->tv_usec < 0)) {
+		tv->tv_usec += ZEND_MICRO_IN_SEC;
+		tv->tv_sec  -= 1;
+	}
+}
+
+/* Assign double (seconds) to timeval */
+static zend_always_inline void zend_time_dbl2val(double s, struct timeval *tv) {
+	tv->tv_sec  = (tv_sec_t) s;
+	tv->tv_usec = (tv_usec_t) ((s - tv->tv_sec) * ZEND_MICRO_IN_SEC);
+
+	if (UNEXPECTED(tv->tv_usec < 0)) {
+		tv->tv_usec += ZEND_MICRO_IN_SEC;
+		tv->tv_sec  -= 1;
+	} else if (UNEXPECTED(tv->tv_usec >= ZEND_MICRO_IN_SEC)) {
+		// rare, but protects against rounding up to exactly 1 second
+		tv->tv_usec -= ZEND_MICRO_IN_SEC;
+		tv->tv_sec  += 1;
+	}
+}
+
+/* Assign timeval to timespec */
+static zend_always_inline void zend_time_val2spec(struct timeval tv, struct timespec *ts) {
+	ts->tv_sec  = (time_t) tv.tv_sec;
+	ts->tv_nsec = (long) (tv.tv_usec * 1000);
+}
+
+/* Get current timestamp in seconds */
+static zend_always_inline time_t zend_time_real_get(void) {
+	return time(NULL);
+}
 
 /* wrapper around clock_gettime/timestamp_get/gettimeofday/time */
-ZEND_API void zend_realtime_spec(struct timespec *ts);
+static zend_always_inline void zend_time_real_spec(struct timespec *ts) {
+	#if defined(HAVE_CLOCK_GETTIME)
+
+		(void) clock_gettime(CLOCK_REALTIME, ts);
+
+	#elif defined(HAVE_TIMESPEC_GET)
+
+		(void) timespec_get(ts, TIME_UTC);
+
+	#elif defined(HAVE_GETTIMEOFDAY)
+
+		struct timeval tv;
+		(void) gettimeofday(&tv, NULL);
+		zend_time_val2spec(tv, ts);
+
+	#else
+
+		ts->tv_sec  = zend_time_real_get();
+		ts->tv_nsec = 0;
+
+	#endif
+}
 
 /* Monotonic time in nanoseconds with a fallback to real/wall-time 
    if no monotonic timer is available */
-#if ZEND_HRTIME_AVAILABLE
-# define zend_monotime_fallback() (uint64_t)zend_hrtime()
-#else
-ZEND_API zend_always_inline uint64_t zend_monotime_fallback(void) {
-   struct timespec ts;
-   zend_realtime_spec(&ts);
-   return ((uint64_t) ts.tv_sec * ZEND_NANO_IN_SEC) + ts.tv_nsec;
+static zend_always_inline uint64_t zend_time_mono_fallback(void) {
+	#if ZEND_HRTIME_AVAILABLE
+		return (uint64_t)zend_hrtime();
+	#else
+		struct timespec ts;
+		zend_time_real_spec(&ts);
+		return ((uint64_t) ts.tv_sec * ZEND_NANO_IN_SEC) + ts.tv_nsec;
+	#endif
 }
-#endif
 
 END_EXTERN_C()
 

Zend/zend_time.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 = zend_realtime_get();
+				*t = zend_time_real_get();
 			}
 			if ((bucket = realpath_cache_find(path, len, *t)) != NULL) {
 				if (is_dir && !bucket->is_dir) {

Zend/zend_virtual_cwd.c

@@ -1761,7 +1761,6 @@ PHP_ADD_SOURCES([Zend], m4_normalize([
     zend_generators.c
     zend_hash.c
     zend_highlight.c
-    zend_time.c
     zend_hrtime.c
     zend_inheritance.c
     zend_ini_parser.c

configure.ac

@@ -36,7 +36,7 @@ PHP_FUNCTION(unixtojd)
 	}
 
 	if (tl_is_null) {
-		ts = zend_realtime_get();
+		ts = zend_time_real_get();
 	} else if (tl >= 0) {
 		ts = (time_t) tl;
 	} else {

ext/calendar/cal_unix.c

@@ -43,7 +43,7 @@ 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 = zend_realtime_get();
+		time_t a = zend_time_real_get();
 		struct tm b, *res;
 		res = php_localtime_r(&a, &b);
 		if (!res) {

ext/calendar/easter.c

@@ -49,6 +49,11 @@ 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
 
+ZEND_ATTRIBUTE_DEPRECATED
+PHPAPI time_t php_time(void) {
+	return zend_time_real_get();
+}
+
 /*
  * RFC822, Section 5.1: http://www.ietf.org/rfc/rfc822.txt
  *  date-time   =  [ day "," ] date time        ; dd mm yy hh:mm:ss zzz
@@ -847,7 +852,7 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, bool localtime)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ts_is_null) {
-		ts = zend_realtime_get();
+		ts = zend_time_real_get();
 	}
 
 	RETURN_STR(php_format_date(ZSTR_VAL(format), ZSTR_LEN(format), ts, localtime));
@@ -1011,7 +1016,7 @@ PHP_FUNCTION(idate)
 	}
 
 	if (ts_is_null) {
-		ts = zend_realtime_get();
+		ts = zend_time_real_get();
 	}
 
 	ret = php_idate(ZSTR_VAL(format)[0], ts, 0);
@@ -1091,7 +1096,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());
+		!preset_ts_is_null ? (timelib_sll) preset_ts : (timelib_sll) zend_time_real_get());
 
 	t = timelib_strtotime(ZSTR_VAL(times), ZSTR_LEN(times), &error,
 		DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
@@ -1142,15 +1147,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());
+		timelib_unixtime2gmt(now, (timelib_sll) zend_time_real_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());
+		timelib_unixtime2local(now, (timelib_sll) zend_time_real_get());
 	}
 
 	now->h = hou;
@@ -1260,7 +1265,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, bool gmt)
 	}
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) zend_realtime_get();
+		timestamp = (zend_long) zend_time_real_get();
 	}
 
 	ts = timelib_time_ctor();
@@ -1356,7 +1361,7 @@ PHP_FUNCTION(time)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	RETURN_LONG((zend_long) zend_realtime_get());
+	RETURN_LONG((zend_long) zend_time_real_get());
 }
 /* }}} */
 
@@ -1376,7 +1381,7 @@ PHP_FUNCTION(localtime)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) zend_realtime_get();
+		timestamp = (zend_long) zend_time_real_get();
 	}
 
 	tzi = get_timezone_info();
@@ -1431,7 +1436,7 @@ PHP_FUNCTION(getdate)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (timestamp_is_null) {
-		timestamp = (zend_long) zend_realtime_get();
+		timestamp = (zend_long) zend_time_real_get();
 	}
 
 	tzi = get_timezone_info();
@@ -2331,15 +2336,6 @@ static void php_date_set_time_fraction(timelib_time *time, int microsecond)
 	time->us = microsecond;
 }
 
-static void php_date_get_current_time_with_fraction(time_t *sec, suseconds_t *usec)
-{
-	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) /* {{{ */
 {
 	timelib_time   *now;
@@ -2348,8 +2344,7 @@ PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, siz
 	int type = TIMELIB_ZONETYPE_ID, new_dst = 0;
 	char *new_abbr = NULL;
 	timelib_sll new_offset = 0;
-	time_t sec;
-	suseconds_t usec;
+	struct timespec ts;
 	int options = 0;
 
 	if (dateobj->time) {
@@ -2428,9 +2423,9 @@ PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, siz
 			now->tz_abbr = new_abbr;
 			break;
 	}
-	php_date_get_current_time_with_fraction(&sec, &usec);
-	timelib_unixtime2local(now, (timelib_sll) sec);
-	php_date_set_time_fraction(now, usec);
+	zend_time_real_spec(&ts);
+	timelib_unixtime2local(now, (timelib_sll) ts.tv_sec);
+	php_date_set_time_fraction(now, ts.tv_nsec / 1000);
 
 	if (!format
 	 && time_str_len == sizeof("now") - 1

ext/date/php_date.c

@@ -19,6 +19,7 @@
 
 #include "lib/timelib.h"
 #include "Zend/zend_hash.h"
+#include "Zend/zend_time.h"
 
 /* Same as SIZEOF_ZEND_LONG but using TIMELIB_LONG_MAX/MIN */
 #if TIMELIB_LONG_MAX == INT32_MAX
@@ -129,8 +130,8 @@ ZEND_END_MODULE_GLOBALS(date)
 
 #define DATEG(v) ZEND_MODULE_GLOBALS_ACCESSOR(date, v)
 
-/* DEPRECATED, use zend_realtime_get() instead */
-#define php_time() zend_realtime_get()
+ZEND_ATTRIBUTE_DEPRECATED
+PHPAPI time_t php_time(void);
 
 /* Backwards compatibility wrapper */
 PHPAPI zend_long php_parse_date(const char *string, zend_long *now);

ext/date/php_date.h

@@ -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 = zend_realtime_get();
+	stamp = zend_time_real_get();
 	gmt = php_gmtime_r(&stamp, &tmbuf);
 	if (!gmt) {
 		return -1;
@@ -1373,11 +1373,11 @@ static int my_poll(php_socket_t fd, int events, int timeout) {
 	uint64_t timeout_ns = (uint64_t) timeout * 1000000;
 
 	while (true) {
-		uint64_t start_ns = zend_monotime_fallback();
+		uint64_t start_ns = zend_time_mono_fallback();
 		n = php_pollfd_for_ms(fd, events, (int) (timeout_ns / 1000000));
 
 		if (n == -1 && php_socket_errno() == EINTR) {
-			uint64_t delta_ns = zend_monotime_fallback() - start_ns;
+			uint64_t delta_ns = zend_time_mono_fallback() - start_ns;
 			if (delta_ns > timeout_ns) {
 #ifndef PHP_WIN32
 				errno = ETIMEDOUT;
@@ -1604,7 +1604,7 @@ static databuf_t* ftp_getdata(ftpbuf_t *ftp)
 		/* connect */
 		/* Win 95/98 seems not to like size > sizeof(sockaddr_in) */
 		size = php_sockaddr_size(&ftp->pasvaddr);
-		zend_time_sec2val(ftp->timeout_sec, tv);
+		zend_time_sec2val(ftp->timeout_sec, &tv);
 		if (php_connect_nonb(fd, (struct sockaddr*) &ftp->pasvaddr, size, &tv) == -1) {
 			php_error_docref(NULL, E_WARNING, "php_connect_nonb() failed: %s (%d)", strerror(errno), errno);
 			goto bail;

ext/ftp/ftp.c

@@ -79,7 +79,7 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self,
 		/* The following from FF's DBUG library, which is in the public domain */
 		struct timespec ts;
 		struct tm *tm_p;
-		zend_realtime_spec(&ts);
+		zend_time_real_spec(&ts);
 		if ((tm_p = localtime((const time_t *)&ts.tv_sec))) {
 			snprintf(time_buffer, sizeof(time_buffer) - 1,
 						/* "%04d-%02d-%02d " */
@@ -164,7 +164,7 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self,
 		/* The following from FF's DBUG library, which is in the public domain */
 		struct timespec ts;
 		struct tm *tm_p;
-		zend_realtime_spec(&ts);
+		zend_time_real_spec(&ts);
 		if ((tm_p = localtime((const time_t *)&ts.tv_sec))) {
 			snprintf(time_buffer, sizeof(time_buffer) - 1,
 						/* "%04d-%02d-%02d " */