Refactor basic time

Author: marc-mabe

Zend/Optimizer/zend_func_infos.h

@@ -559,10 +559,8 @@ static const func_info_t func_infos[] = {
 	F1("dechex", MAY_BE_STRING),
 	F1("base_convert", MAY_BE_STRING),
 	F1("number_format", MAY_BE_STRING),
-#if defined(HAVE_GETTIMEOFDAY)
 	F1("microtime", MAY_BE_STRING|MAY_BE_DOUBLE),
 	F1("gettimeofday", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_DOUBLE),
-#endif
 #if defined(HAVE_GETRUSAGE)
 	F1("getrusage", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_FALSE),
 #endif
@@ -597,9 +595,7 @@ static const func_info_t func_infos[] = {
 	F1("stream_resolve_include_path", MAY_BE_STRING|MAY_BE_FALSE),
 	F1("stream_get_wrappers", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
 	F1("stream_get_transports", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
-#if defined(HAVE_GETTIMEOFDAY)
 	F1("uniqid", MAY_BE_STRING),
-#endif
 	F1("parse_url", MAY_BE_LONG|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_NULL|MAY_BE_FALSE),
 	F1("urlencode", MAY_BE_STRING),
 	F1("urldecode", MAY_BE_STRING),

configure.ac

@@ -529,6 +529,8 @@ AC_CHECK_FUNCS(m4_normalize([
   asctime_r
   asprintf
   chroot
+  clock_gettime
+  clock_getres
   ctime_r
   explicit_memset
   fdatasync
@@ -580,6 +582,8 @@ AC_CHECK_FUNCS(m4_normalize([
   strptime
   strtok_r
   symlink
+  timespec_get
+  timespec_getres
   tzset
   unsetenv
   usleep
@@ -1648,6 +1652,7 @@ PHP_ADD_SOURCES([main], m4_normalize([
     php_scandir.c
     php_syslog.c
     php_ticks.c
+    php_time.c
     php_variables.c
     reentrancy.c
     rfc1867.c

docs-old/streams.md

@@ -90,7 +90,7 @@ PHPAPI php_stream *php_stream_sock_open_from_socket(int socket, int persistent);
     /* Convert a socket into a stream. */
 
 PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short port,
-        int socktype, int timeout, int persistent);
+        int socktype, struct timeval *timeout, const char *persistent_id);
     /* Open a connection to a host and return a stream. */
 
 PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,

ext/date/php_date.c

@@ -17,6 +17,7 @@
 #include "php.h"
 #include "php_main.h"
 #include "php_ini.h"
+#include "php_time.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_versioning.h"
 #include "php_date.h"
@@ -25,11 +26,6 @@
 #include "zend_exceptions.h"
 #include "lib/timelib.h"
 #include "lib/timelib_private.h"
-#ifndef PHP_WIN32
-#include <time.h>
-#else
-#include "win32/time.h"
-#endif
 
 #ifdef PHP_WIN32
 static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; }
@@ -55,18 +51,7 @@ static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i;
 
 PHPAPI time_t php_time(void)
 {
-#ifdef HAVE_GETTIMEOFDAY
-	struct timeval tm;
-
-	if (UNEXPECTED(gettimeofday(&tm, NULL) != SUCCESS)) {
-		/* fallback, can't reasonably happen */
-		return time(NULL);
-	}
-
-	return tm.tv_sec;
-#else
 	return time(NULL);
-#endif
 }
 
 /*
@@ -2353,16 +2338,9 @@ 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)
 {
-#ifdef HAVE_GETTIMEOFDAY
-	struct timeval tp = {0}; /* For setting microsecond */
-
-	gettimeofday(&tp, NULL);
-	*sec = tp.tv_sec;
-	*usec = tp.tv_usec;
-#else
-	*sec = time(NULL);
-	*usec = 0;
-#endif
+	long nsec;
+	php_realtime_get(sec, &nsec);
+	*usec = 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/ftp/ftp.c

@@ -20,6 +20,7 @@
 #endif
 
 #include "php.h"
+#include <php_time.h>
 
 #include <stdio.h>
 #include <ctype.h>
@@ -29,7 +30,6 @@
 #endif
 #include <fcntl.h>
 #include <string.h>
-#include <time.h>
 #ifdef PHP_WIN32
 #include <winsock2.h>
 #else
@@ -1608,8 +1608,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);
-		tv.tv_sec = ftp->timeout_sec;
-		tv.tv_usec = 0;
+		php_timei2val(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/mysqlnd/mysqlnd_debug.c

@@ -16,6 +16,7 @@
 */
 
 #include "php.h"
+#include "php_time.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
 #include "mysqlnd_debug.h"
@@ -76,21 +77,19 @@ MYSQLND_METHOD(mysqlnd_debug, log)(MYSQLND_DEBUG * self,
 	}
 	if (flags & MYSQLND_DEBUG_DUMP_TIME) {
 		/* The following from FF's DBUG library, which is in the public domain */
-		struct timeval tv;
+		struct timespec ts;
 		struct tm *tm_p;
-		if (gettimeofday(&tv, NULL) != -1) {
-			const time_t sec = tv.tv_sec;
-			if ((tm_p = localtime((const time_t *)&sec))) {
-				snprintf(time_buffer, sizeof(time_buffer) - 1,
-						 /* "%04d-%02d-%02d " */
-						 "%02d:%02d:%02d.%06d ",
-						 /*tm_p->tm_year + 1900, tm_p->tm_mon + 1, tm_p->tm_mday,*/
-						 tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec,
-						 (int) (tv.tv_usec));
-				time_buffer[sizeof(time_buffer) - 1 ] = '\0';
-			} else {
-				time_buffer[0] = '\0';
-			}
+		php_realtime_spec(&ts);
+		if ((tm_p = localtime((const time_t *)&ts.tv_sec))) {
+			snprintf(time_buffer, sizeof(time_buffer) - 1,
+						/* "%04d-%02d-%02d " */
+						"%02d:%02d:%02d.%06d ",
+						/*tm_p->tm_year + 1900, tm_p->tm_mon + 1, tm_p->tm_mday,*/
+						tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec,
+						(int) (ts.tv_nsec / 1000));
+			time_buffer[sizeof(time_buffer) - 1 ] = '\0';
+		} else {
+			time_buffer[0] = '\0';
 		}
 	}
 	if (flags & MYSQLND_DEBUG_DUMP_FILE) {
@@ -163,21 +162,19 @@ MYSQLND_METHOD(mysqlnd_debug, log_va)(MYSQLND_DEBUG *self,
 	}
 	if (flags & MYSQLND_DEBUG_DUMP_TIME) {
 		/* The following from FF's DBUG library, which is in the public domain */
-		struct timeval tv;
+		struct timespec ts;
 		struct tm *tm_p;
-		if (gettimeofday(&tv, NULL) != -1) {
-			const time_t sec = tv.tv_sec;
-			if ((tm_p = localtime((const time_t *)&sec))) {
-				snprintf(time_buffer, sizeof(time_buffer) - 1,
-						 /* "%04d-%02d-%02d " */
-						 "%02d:%02d:%02d.%06d ",
-						 /*tm_p->tm_year + 1900, tm_p->tm_mon + 1, tm_p->tm_mday,*/
-						 tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec,
-						 (int) (tv.tv_usec));
-				time_buffer[sizeof(time_buffer) - 1 ] = '\0';
-			} else {
-				time_buffer[0] = '\0';
-			}
+		php_realtime_spec(&ts);
+		if ((tm_p = localtime((const time_t *)&ts.tv_sec))) {
+			snprintf(time_buffer, sizeof(time_buffer) - 1,
+						/* "%04d-%02d-%02d " */
+						"%02d:%02d:%02d.%06d ",
+						/*tm_p->tm_year + 1900, tm_p->tm_mon + 1, tm_p->tm_mday,*/
+						tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec,
+						(int)(ts.tv_nsec / 1000));
+			time_buffer[sizeof(time_buffer) - 1 ] = '\0';
+		} else {
+			time_buffer[0] = '\0';
 		}
 	}
 	if (flags & MYSQLND_DEBUG_DUMP_FILE) {
@@ -329,8 +326,8 @@ MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int lin
 			uint64_t own_time = call_time - mine_non_own_time;
 			uint32_t func_name_len = strlen(*func_name);
 
-			self->m->log_va(self, line, file, zend_stack_count(&self->call_stack) - 1, NULL, "<%s (total=%u own=%u in_calls=%u)",
-						*func_name, (unsigned int) call_time, (unsigned int) own_time, (unsigned int) mine_non_own_time
+			self->m->log_va(self, line, file, zend_stack_count(&self->call_stack) - 1, NULL, "<%s (total=%"PRIu64" own=%"PRIu64" in_calls=%"PRIu64")",
+						*func_name, call_time, own_time, mine_non_own_time
 					);
 
 			if ((f_profile = zend_hash_str_find_ptr(&self->function_profiles, *func_name, func_name_len)) != NULL) {

ext/mysqlnd/mysqlnd_debug.h

@@ -80,18 +80,16 @@ PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[]);
 
 
 #if defined(__GNUC__) || defined(PHP_WIN32)
-#ifdef PHP_WIN32
-#include "win32/time.h"
-#else
-#include <sys/time.h>
-#endif
+#include "php_time.h"
 
 #ifndef MYSQLND_PROFILING_DISABLED
-#define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)	((tp.tv_sec * 1000000LL)+ tp.tv_usec)
-#define DBG_PROFILE_START_TIME()		gettimeofday(&__dbg_prof_tp, NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
-#define DBG_PROFILE_END_TIME(duration)	gettimeofday(&__dbg_prof_tp, NULL); (duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);
+#define DBG_PROFILE_START_TIME() \
+	php_realtime_spec(&__dbg_prof_ts); \
+	__dbg_prof_start = (uint64_t)(__dbg_prof_ts.tv_sec * UINT64_C(1000000000) + __dbg_prof_ts.tv_nsec);
+#define DBG_PROFILE_END_TIME(duration) \
+	php_realtime_spec(&__dbg_prof_ts); \
+	(duration) = (uint64_t)(__dbg_prof_ts.tv_sec * UINT64_C(1000000000) + __dbg_prof_ts.tv_nsec) - __dbg_prof_start;
 #else
-#define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)
 #define DBG_PROFILE_START_TIME()
 #define DBG_PROFILE_END_TIME(duration)
 #endif
@@ -117,7 +115,7 @@ PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[]);
 #define DBG_LEAVE_EX(dbg_obj, leave)		DBG_LEAVE_EX2((dbg_obj), (MYSQLND_DEBUG *) NULL, leave)
 
 #define DBG_ENTER_EX2(dbg_obj1, dbg_obj2, func_name) \
-					struct timeval __dbg_prof_tp = {0}; \
+					struct timespec __dbg_prof_ts; \
 					uint64_t __dbg_prof_start = 0; /* initialization is needed */ \
 					bool dbg_skip_trace = TRUE; \
 					((void)__dbg_prof_start); \

ext/mysqlnd/mysqlnd_vio.c

@@ -204,8 +204,7 @@ MYSQLND_METHOD(mysqlnd_vio, open_tcp_or_unix)(MYSQLND_VIO * const vio, const MYS
 	}
 
 	if (vio->data->options.timeout_connect) {
-		tv.tv_sec = vio->data->options.timeout_connect;
-		tv.tv_usec = 0;
+		php_timei2val(vio->data->options.timeout_connect, tv);
 	}
 
 	DBG_INF_FMT("calling php_stream_xport_create");