From 92b4f1372e54964283c51a1bde079e03dd927890 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 1 Jun 2020 11:05:15 +0200 Subject: [PATCH] REORG: include: move time.h from common/ to haproxy/ This one is included almost everywhere and used to rely on a few other .h that are not needed (unistd, stdlib, standard.h). It could possibly make sense to split it into multiple parts to distinguish operations performed on timers and the internal time accounting, but at this point it does not appear much important. --- contrib/mod_defender/defender.c | 2 +- contrib/modsecurity/modsec_wrapper.c | 2 +- include/{common => haproxy}/time.h | 34 +++++++++++++--------------- include/proto/activity.h | 2 +- include/proto/backend.h | 2 +- include/proto/channel.h | 2 +- include/proto/fd.h | 2 +- include/proto/freq_ctr.h | 2 +- include/proto/peers.h | 2 +- include/proto/proxy.h | 2 +- include/proto/server.h | 2 +- include/proto/stick_table.h | 2 +- src/backend.c | 2 +- src/calltrace.c | 2 +- src/cfgparse.c | 2 +- src/checks.c | 2 +- src/cli.c | 2 +- src/dns.c | 2 +- src/ev_epoll.c | 2 +- src/ev_evports.c | 2 +- src/ev_kqueue.c | 2 +- src/ev_poll.c | 2 +- src/ev_select.c | 2 +- src/flt_spoe.c | 2 +- src/flt_trace.c | 2 +- src/freq_ctr.c | 2 +- src/frontend.c | 2 +- src/haproxy.c | 2 +- src/hlua_fcn.c | 2 +- src/listener.c | 2 +- src/log.c | 2 +- src/peers.c | 2 +- src/proto_sockpair.c | 2 +- src/proto_uxst.c | 2 +- src/proxy.c | 2 +- src/queue.c | 2 +- src/raw_sock.c | 2 +- src/server.c | 2 +- src/sink.c | 2 +- src/ssl_sock.c | 2 +- src/stats.c | 2 +- src/stick_table.c | 2 +- src/stream_interface.c | 2 +- src/task.c | 2 +- src/tcp_rules.c | 2 +- src/time.c | 2 +- 46 files changed, 61 insertions(+), 63 deletions(-) rename include/{common => haproxy}/time.h (98%) diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c index b552a7c717..f3b9055118 100644 --- a/contrib/mod_defender/defender.c +++ b/contrib/mod_defender/defender.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c index 7ae831e5c2..056da542ac 100644 --- a/contrib/modsecurity/modsec_wrapper.c +++ b/contrib/modsecurity/modsec_wrapper.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/include/common/time.h b/include/haproxy/time.h similarity index 98% rename from include/common/time.h rename to include/haproxy/time.h index d6863d42c8..4f1dc85454 100644 --- a/include/common/time.h +++ b/include/haproxy/time.h @@ -1,8 +1,8 @@ /* - * include/common/time.h + * include/haproxy/time.h * Time calculation functions and macros. * - * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu + * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,15 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _COMMON_TIME_H -#define _COMMON_TIME_H +#ifndef _HAPROXY_TIME_H +#define _HAPROXY_TIME_H -#include -#include #include +#include #include #include -#include /* eternity when exprimed in timeval */ #ifndef TV_ETERNITY @@ -82,16 +80,6 @@ int tv_ms_cmp(const struct timeval *tv1, const struct timeval *tv2); */ int tv_ms_cmp2(const struct timeval *tv1, const struct timeval *tv2); -/**** general purpose functions and macros *******************************/ - - -/* tv_now: sets to the current time */ -static inline struct timeval *tv_now(struct timeval *tv) -{ - gettimeofday(tv, NULL); - return tv; -} - /* tv_udpate_date: sets to system time, and sets to something as * close as possible to real time, following a monotonic function. The main * principle consists in detecting backwards and forwards time jumps and adjust @@ -104,6 +92,16 @@ void tv_update_date(int max_wait, int interrupted); char *timeofday_as_iso_us(int pad); +/**** general purpose functions and macros *******************************/ + + +/* tv_now: sets to the current time */ +static inline struct timeval *tv_now(struct timeval *tv) +{ + gettimeofday(tv, NULL); + return tv; +} + /* * sets a struct timeval to its highest value so that it can never happen * note that only tv_usec is necessary to detect it since a tv_usec > 999999 @@ -602,7 +600,7 @@ static inline void tv_leaving_poll(int timeout, int interrupted) ti->prev_mono_time = now_mono_time(); } -#endif /* _COMMON_TIME_H */ +#endif /* _HAPROXY_TIME_H */ /* * Local variables: diff --git a/include/proto/activity.h b/include/proto/activity.h index 9d5044a08b..9ca9a4294e 100644 --- a/include/proto/activity.h +++ b/include/proto/activity.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/include/proto/backend.h b/include/proto/backend.h index 516049286f..f702be9c20 100644 --- a/include/proto/backend.h +++ b/include/proto/backend.h @@ -23,7 +23,7 @@ #define _PROTO_BACKEND_H #include -#include +#include #include #include diff --git a/include/proto/channel.h b/include/proto/channel.h index 16954bac05..eaaa36bcce 100644 --- a/include/proto/channel.h +++ b/include/proto/channel.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/proto/fd.h b/include/proto/fd.h index 9426e1447d..f882b54a77 100644 --- a/include/proto/fd.h +++ b/include/proto/fd.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/include/proto/freq_ctr.h b/include/proto/freq_ctr.h index 80529bf23c..896a4694e4 100644 --- a/include/proto/freq_ctr.h +++ b/include/proto/freq_ctr.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/include/proto/peers.h b/include/proto/peers.h index fbe6cf6a66..02fc67d69d 100644 --- a/include/proto/peers.h +++ b/include/proto/peers.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/proxy.h b/include/proto/proxy.h index 630a0112e8..066e8076a8 100644 --- a/include/proto/proxy.h +++ b/include/proto/proxy.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/server.h b/include/proto/server.h index e184310fc0..d15808953f 100644 --- a/include/proto/server.h +++ b/include/proto/server.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h index 986c7755f7..dcc29546b7 100644 --- a/include/proto/stick_table.h +++ b/include/proto/stick_table.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/src/backend.c b/src/backend.c index c876003f9d..ff6c37d2bd 100644 --- a/src/backend.c +++ b/src/backend.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/calltrace.c b/src/calltrace.c index a4f3bbe9f2..2208ca11bc 100644 --- a/src/calltrace.c +++ b/src/calltrace.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include static FILE *log; static int level; diff --git a/src/cfgparse.c b/src/cfgparse.c index f4de78a9b4..a1917fa238 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/checks.c b/src/checks.c index 92f1e4a201..6744e2d3c4 100644 --- a/src/checks.c +++ b/src/checks.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/cli.c b/src/cli.c index 4b9c31f975..6c7bc3f525 100644 --- a/src/cli.c +++ b/src/cli.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/dns.c b/src/dns.c index b11622c263..73258c0ecc 100644 --- a/src/dns.c +++ b/src/dns.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ev_epoll.c b/src/ev_epoll.c index 132d4876a1..8378383af8 100644 --- a/src/ev_epoll.c +++ b/src/ev_epoll.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include diff --git a/src/ev_evports.c b/src/ev_evports.c index e440f15447..359acf9532 100644 --- a/src/ev_evports.c +++ b/src/ev_evports.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c index 5b14d51fd3..efc2ecf760 100644 --- a/src/ev_kqueue.c +++ b/src/ev_kqueue.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include diff --git a/src/ev_poll.c b/src/ev_poll.c index c3c52f0db2..7239732d83 100644 --- a/src/ev_poll.c +++ b/src/ev_poll.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include diff --git a/src/ev_select.c b/src/ev_select.c index 3b02bed40d..9168f59aa9 100644 --- a/src/ev_select.c +++ b/src/ev_select.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 7021e556d5..930c2ecbf6 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/flt_trace.c b/src/flt_trace.c index fdc74a7eb5..69862aec7c 100644 --- a/src/flt_trace.c +++ b/src/flt_trace.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/freq_ctr.c b/src/freq_ctr.c index 56ac97d2aa..16201560db 100644 --- a/src/freq_ctr.c +++ b/src/freq_ctr.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include /* Read a frequency counter taking history into account for missing time in diff --git a/src/frontend.c b/src/frontend.c index ce5c3d7623..b111e6ad51 100644 --- a/src/frontend.c +++ b/src/frontend.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/src/haproxy.c b/src/haproxy.c index 67e423783a..a2ceeec575 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -92,7 +92,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c index a914066031..da975c0752 100644 --- a/src/hlua_fcn.c +++ b/src/hlua_fcn.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/listener.c b/src/listener.c index 3315d60e78..8de3b37e94 100644 --- a/src/listener.c +++ b/src/listener.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/log.c b/src/log.c index a8bf820aad..d4f49226c8 100644 --- a/src/log.c +++ b/src/log.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/peers.c b/src/peers.c index 6d5a5de61f..5f4dce3cbd 100644 --- a/src/peers.c +++ b/src/peers.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c index b6277247f4..1c13518002 100644 --- a/src/proto_sockpair.c +++ b/src/proto_sockpair.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/proto_uxst.c b/src/proto_uxst.c index ae68a8d1d9..99e4eff058 100644 --- a/src/proto_uxst.c +++ b/src/proto_uxst.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/proxy.c b/src/proxy.c index b5bc5ae9da..5e29ec95c3 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/queue.c b/src/queue.c index f2407ed671..e354e0a484 100644 --- a/src/queue.c +++ b/src/queue.c @@ -71,7 +71,7 @@ #include #include -#include +#include #include #include diff --git a/src/raw_sock.c b/src/raw_sock.c index 3612442c16..1d930d80f4 100644 --- a/src/raw_sock.c +++ b/src/raw_sock.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/server.c b/src/server.c index bdf2c994db..d06c46502e 100644 --- a/src/server.c +++ b/src/server.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/sink.c b/src/sink.c index 9ed75aca9b..b5ecdde9a3 100644 --- a/src/sink.c +++ b/src/sink.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 0b0b4b9f12..729f26c7ac 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/stats.c b/src/stats.c index e7a1e76f64..c0d0eb0732 100644 --- a/src/stats.c +++ b/src/stats.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/stick_table.c b/src/stick_table.c index dc2ef4f82f..0fb0927ba5 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/stream_interface.c b/src/stream_interface.c index 91f844b971..89f37ee13f 100644 --- a/src/stream_interface.c +++ b/src/stream_interface.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/task.c b/src/task.c index 55a54a4712..452530ef33 100644 --- a/src/task.c +++ b/src/task.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/tcp_rules.c b/src/tcp_rules.c index 194301874f..f79d2a3f78 100644 --- a/src/tcp_rules.c +++ b/src/tcp_rules.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/time.c b/src/time.c index 86c2469878..a6aaf40339 100644 --- a/src/time.c +++ b/src/time.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include THREAD_LOCAL unsigned int ms_left_scaled; /* milliseconds left for current second (0..2^32-1) */ -- 2.47.2