Merge branch 'mainstream'

[sliver-openvswitch.git] / lib / timeval.h

diff --git a/lib/timeval.h b/lib/timeval.h
index 8567d75..8dd2e2b 100644 (file)
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,13 @@
 #include "type-props.h"
 #include "util.h"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct ds;
 struct pollfd;
+struct timespec;
 struct timeval;
 
 /* POSIX allows floating-point time_t, but we don't support it. */
@@ -34,19 +40,47 @@ BUILD_ASSERT_DECL(TYPE_IS_SIGNED(time_t));
 #define TIME_MAX TYPE_MAXIMUM(time_t)
 #define TIME_MIN TYPE_MINIMUM(time_t)
 
-/* Interval between updates to the time reported by time_gettimeofday(), in ms.
- * This should not be adjusted much below 10 ms or so with the current
- * implementation, or too much time will be wasted in signal handlers and calls
- * to time(0). */
-#define TIME_UPDATE_INTERVAL 100
+/* Interval between updates to the reported time, in ms.  This should not be
+ * adjusted much below 10 ms or so with the current implementation, or too
+ * much time will be wasted in signal handlers and calls to clock_gettime(). */
+#define TIME_UPDATE_INTERVAL 25
+
+/* True on systems that support a monotonic clock.  Compared to just getting
+ * the value of a variable, clock_gettime() is somewhat expensive, even on
+ * systems that try hard to optimize it (such as x86-64 Linux), so it's
+ * worthwhile to minimize calls via caching. */
+#ifndef CACHE_TIME
+#if defined ESX
+#define CACHE_TIME 0
+#else
+#define CACHE_TIME 1
+#endif
+#endif /* ifndef CACHE_TIME */
 
-void time_init(void);
 void time_postfork(void);
 void time_refresh(void);
 time_t time_now(void);
+time_t time_wall(void);
 long long int time_msec(void);
-void time_timeval(struct timeval *);
+long long int time_wall_msec(void);
+void time_timespec(struct timespec *);
+void time_wall_timespec(struct timespec *);
 void time_alarm(unsigned int secs);
-int time_poll(struct pollfd *, int n_pollfds, int timeout);
+int time_poll(struct pollfd *, int n_pollfds, long long int timeout_when,
+              int *elapsed);
+
+long long int timespec_to_msec(const struct timespec *);
+long long int timeval_to_msec(const struct timeval *);
+
+void xgettimeofday(struct timeval *);
+void xclock_gettime(clock_t, struct timespec *);
+
+int get_cpu_usage(void);
+
+long long int time_boot_msec(void);
+
+#ifdef  __cplusplus
+}
+#endif
 
 #endif /* timeval.h */