RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-28 16:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: time/ticks: move now_ms and global_now_ms definitions to ticks.h

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2021-10-06 16:03:19 +02:00
parent 078c2573c2
commit f2d0ec98ab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/ticks.h
View File

@ -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)
{

2
include/haproxy/time.h
View File

@ -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 *************************************************/