From f2d0ec98abd0e9352a70b2fde373cdeb0e89c47c Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 6 Oct 2021 16:03:19 +0200 Subject: [PATCH] REORG: time/ticks: move now_ms and global_now_ms definitions to ticks.h These are ticks, not timeval, and they're a cause for plenty of files including time.h just to access now_ms that's only used with ticks functions. Let's move them over there. --- include/haproxy/ticks.h | 4 ++++ include/haproxy/time.h | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/haproxy/ticks.h b/include/haproxy/ticks.h index 52344ae25..8b8fcc632 100644 --- a/include/haproxy/ticks.h +++ b/include/haproxy/ticks.h @@ -62,6 +62,10 @@ #define MS_TO_TICKS(ms) (ms) #define TICKS_TO_MS(tk) (tk) +/* currently updated and stored in time.c */ +extern THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */ +extern volatile unsigned int global_now_ms; + /* return 1 if tick is set, otherwise 0 */ static inline int tick_isset(int expire) { diff --git a/include/haproxy/time.h b/include/haproxy/time.h index 436b1a8a0..bcba0f8f9 100644 --- a/include/haproxy/time.h +++ b/include/haproxy/time.h @@ -49,14 +49,12 @@ #define MINTIME(old, new) (((new)<0)?(old):(((old)<0||(new)<(old))?(new):(old))) #define SETNOW(a) (*a=now) -extern THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */ extern THREAD_LOCAL struct timeval now; /* internal date is a monotonic function of real clock */ extern THREAD_LOCAL struct timeval date; /* the real current date */ extern struct timeval start_date; /* the process's start date */ extern THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */ extern THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */ extern volatile unsigned long long global_now; -extern volatile unsigned int global_now_ms; /**** exported functions *************************************************/