mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: threads/time: Many global variables from time.h are now thread-local

Browse Source
This commit is contained in:
Christopher Faulet 2017-05-11 11:00:15 +02:00 committed by Willy Tarreau
parent 6adad11283
commit 9a65571781
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/common/time.h
View File

@ -49,18 +49,18 @@
#define MINTIME(old, new) (((new)<0)?(old):(((old)<0||(new)<(old))?(new):(old))) #define MINTIME(old, new) (((new)<0)?(old):(((old)<0||(new)<(old))?(new):(old)))
#define SETNOW(a) (*a=now) #define SETNOW(a) (*a=now)
extern unsigned int curr_sec_ms; /* millisecond of current second (0..999) */ extern THREAD_LOCAL unsigned int curr_sec_ms; /* millisecond of current second (0..999) */
extern unsigned int ms_left_scaled; /* milliseconds left for current second (0..2^32-1) */ extern THREAD_LOCAL unsigned int ms_left_scaled; /* milliseconds left for current second (0..2^32-1) */
extern unsigned int curr_sec_ms_scaled; /* millisecond of current second (0..2^32-1) */ extern THREAD_LOCAL unsigned int curr_sec_ms_scaled; /* millisecond of current second (0..2^32-1) */
extern unsigned int now_ms; /* internal date in milliseconds (may wrap) */ extern THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */
extern unsigned int samp_time; /* total elapsed time over current sample */ extern THREAD_LOCAL unsigned int samp_time; /* total elapsed time over current sample */
extern unsigned int idle_time; /* total idle time over current sample */ extern THREAD_LOCAL unsigned int idle_time; /* total idle time over current sample */
extern unsigned int idle_pct; /* idle to total ratio over last sample (percent) */ extern THREAD_LOCAL unsigned int idle_pct; /* idle to total ratio over last sample (percent) */
extern struct timeval now; /* internal date is a monotonic function of real clock */ extern THREAD_LOCAL struct timeval now; /* internal date is a monotonic function of real clock */
extern struct timeval date; /* the real current date */ extern THREAD_LOCAL struct timeval date; /* the real current date */
extern struct timeval start_date; /* the process's start date */ extern struct timeval start_date; /* the process's start date */
extern struct timeval before_poll; /* system date before calling poll() */ extern THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */
extern struct timeval after_poll; /* system date after leaving poll() */ extern THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */
/**** exported functions *************************************************/ /**** exported functions *************************************************/

18
src/time.c
View File

@ -16,16 +16,16 @@
#include <common/standard.h> #include <common/standard.h>
#include <common/time.h> #include <common/time.h>
unsigned int ms_left_scaled; /* milliseconds left for current second (0..2^32-1) */ THREAD_LOCAL unsigned int ms_left_scaled; /* milliseconds left for current second (0..2^32-1) */
unsigned int now_ms; /* internal date in milliseconds (may wrap) */ THREAD_LOCAL unsigned int now_ms; /* internal date in milliseconds (may wrap) */
unsigned int samp_time; /* total elapsed time over current sample */ THREAD_LOCAL unsigned int samp_time; /* total elapsed time over current sample */
unsigned int idle_time; /* total idle time over current sample */ THREAD_LOCAL unsigned int idle_time; /* total idle time over current sample */
unsigned int idle_pct; /* idle to total ratio over last sample (percent) */ THREAD_LOCAL unsigned int idle_pct; /* idle to total ratio over last sample (percent) */
struct timeval now; /* internal date is a monotonic function of real clock */ THREAD_LOCAL struct timeval now; /* internal date is a monotonic function of real clock */
struct timeval date; /* the real current date */ THREAD_LOCAL struct timeval date; /* the real current date */
struct timeval start_date; /* the process's start date */ struct timeval start_date; /* the process's start date */
struct timeval before_poll; /* system date before calling poll() */ THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */
struct timeval after_poll; /* system date after leaving poll() */ THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */
/* /*
* adds <ms> ms to <from>, set the result to <tv> and returns a pointer <tv> * adds <ms> ms to <from>, set the result to <tv> and returns a pointer <tv>