CLEANUP: time: move a few configurable defines to defaults.h

TV_ETERNITY, TV_ETERNITY_MS and MAX_DELAY_MS may be configured and
ought to be in defaults.h so that they can be inherited from everywhere
without including time.h and could also be redefined if neede
(particularly for MAX_DELAY_MS).

diff --git a/include/haproxy/defaults.h b/include/haproxy/defaults.h
index 7547a17dac7229e955d1aedb5fdb28e70d816b27..a6337e9c39b88caa929e19628274267e3e84b834 100644 (file)
--- a/include/haproxy/defaults.h
+++ b/include/haproxy/defaults.h
@@ -167,6 +167,23 @@
 #define MAX_POLL_EVENTS 200
 #endif
 
+/* eternity when exprimed in timeval */
+#ifndef TV_ETERNITY
+#define TV_ETERNITY     (~0UL)
+#endif
+
+/* eternity when exprimed in ms */
+#ifndef TV_ETERNITY_MS
+#define TV_ETERNITY_MS  (-1)
+#endif
+
+/* we want to be able to detect time jumps. Fix the maximum wait time to a low
+ * value so that we know the time has changed if we wait longer.
+ */
+#ifndef MAX_DELAY_MS
+#define MAX_DELAY_MS    60000
+#endif
+
 // The maximum number of connections accepted at once by a thread for a single
 // listener. It used to default to 64 divided by the number of processes but
 // the tasklet-based model is much more scalable and benefits from smaller

diff --git a/include/haproxy/time.h b/include/haproxy/time.h
index bcba0f8f946770263fd7d975dd8ac844b0639e99..d1f181c7b9377dbe4e9ed2c4133afa2f13019a49 100644 (file)
--- a/include/haproxy/time.h
+++ b/include/haproxy/time.h
@@ -27,24 +27,8 @@
 #include <haproxy/api.h>
 #include <haproxy/thread.h>
 
-/* eternity when exprimed in timeval */
-#ifndef TV_ETERNITY
-#define TV_ETERNITY     (~0UL)
-#endif
-
-/* eternity when exprimed in ms */
-#ifndef TV_ETERNITY_MS
-#define TV_ETERNITY_MS  (-1)
-#endif
-
 #define TIME_ETERNITY   (TV_ETERNITY_MS)
 
-/* we want to be able to detect time jumps. Fix the maximum wait time to a low
- * value so that we know the time has changed if we wait longer.
- */
-#define MAX_DELAY_MS    60000
-
-
 /* returns the lowest delay amongst <old> and <new>, and respects TIME_ETERNITY */
 #define MINTIME(old, new)      (((new)<0)?(old):(((old)<0||(new)<(old))?(new):(old)))
 #define SETNOW(a)              (*a=now)