mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: clock: make global_now_ns a pointer as well

Browse Source 
Similar to previous commit but for global_now_ns
This commit is contained in:
Aurelien DARRAGON 2025-06-26 12:58:07 +02:00
parent 4a20b3835a
commit 14966c856b
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/clock.h
View File

@ -28,7 +28,7 @@
extern struct timeval start_date; /* the process's start date in wall-clock time */ extern struct timeval start_date; /* the process's start date in wall-clock time */
extern struct timeval ready_date; /* date when the process was considered ready */ extern struct timeval ready_date; /* date when the process was considered ready */
extern ullong start_time_ns; /* the process's start date in internal monotonic time (ns) */ extern ullong start_time_ns; /* the process's start date in internal monotonic time (ns) */
extern volatile ullong global_now_ns; /* common monotonic date between all threads, in ns (wraps every 585 yr) */ extern volatile ullong *global_now_ns;/* common monotonic date between all threads, in ns (wraps every 585 yr) */
extern THREAD_LOCAL ullong now_ns; /* internal monotonic date derived from real clock, in ns (wraps every 585 yr) */ extern THREAD_LOCAL ullong now_ns; /* internal monotonic date derived from real clock, in ns (wraps every 585 yr) */
extern THREAD_LOCAL struct timeval date; /* the real current date (wall-clock time) */ extern THREAD_LOCAL struct timeval date; /* the real current date (wall-clock time) */

25
src/clock.c
View File

@ -29,7 +29,8 @@
struct timeval start_date; /* the process's start date in wall-clock time */ struct timeval start_date; /* the process's start date in wall-clock time */
struct timeval ready_date; /* date when the process was considered ready */ struct timeval ready_date; /* date when the process was considered ready */
ullong start_time_ns; /* the process's start date in internal monotonic time (ns) */ ullong start_time_ns; /* the process's start date in internal monotonic time (ns) */
volatile ullong global_now_ns; /* common monotonic date between all threads, in ns (wraps every 585 yr) */ volatile ullong _global_now_ns; /* locally stored common monotonic date between all threads, in ns (wraps every 585 yr) */
volatile ullong *global_now_ns; /* common monotonic date, may point to _global_now_ns or shared memory */
volatile uint _global_now_ms; /* locally stored common monotonic date in milliseconds (may wrap) */ volatile uint _global_now_ms; /* locally stored common monotonic date in milliseconds (may wrap) */
volatile uint *global_now_ms; /* common monotonic date in milliseconds (may wrap), may point to _global_now_ms or shared memory */ volatile uint *global_now_ms; /* common monotonic date in milliseconds (may wrap), may point to _global_now_ms or shared memory */
@ -239,7 +240,7 @@ void clock_update_local_date(int max_wait, int interrupted)
now_ns += ms_to_ns(max_wait); now_ns += ms_to_ns(max_wait);
/* consider the most recent known date */ /* consider the most recent known date */
now_ns = MAX(now_ns, HA_ATOMIC_LOAD(&global_now_ns)); now_ns = MAX(now_ns, HA_ATOMIC_LOAD(global_now_ns));
/* this event is rare, but it requires proper handling because if /* this event is rare, but it requires proper handling because if
* we just left now_ns where it was, the date will not be updated * we just left now_ns where it was, the date will not be updated
@ -270,7 +271,7 @@ void clock_update_global_date()
* realistic regarding the global date, which only moves forward, * realistic regarding the global date, which only moves forward,
* otherwise catch up. * otherwise catch up.
*/ */
old_now_ns = _HA_ATOMIC_LOAD(&global_now_ns); old_now_ns = _HA_ATOMIC_LOAD(global_now_ns);
old_now_ms = _HA_ATOMIC_LOAD(global_now_ms); old_now_ms = _HA_ATOMIC_LOAD(global_now_ms);
do { do {
@ -300,7 +301,7 @@ void clock_update_global_date()
/* let's try to update the global_now_ns (both in nanoseconds /* let's try to update the global_now_ns (both in nanoseconds
* and ms forms) or loop again. * and ms forms) or loop again.
*/ */
} while ((!_HA_ATOMIC_CAS(&global_now_ns, &old_now_ns, now_ns) || } while ((!_HA_ATOMIC_CAS(global_now_ns, &old_now_ns, now_ns) ||
(now_ms != old_now_ms && !_HA_ATOMIC_CAS(global_now_ms, &old_now_ms, now_ms))) && (now_ms != old_now_ms && !_HA_ATOMIC_CAS(global_now_ms, &old_now_ms, now_ms))) &&
__ha_cpu_relax()); __ha_cpu_relax());
@ -323,10 +324,10 @@ void clock_init_process_date(void)
th_ctx->prev_mono_time = th_ctx->curr_mono_time = before_poll_mono_ns; th_ctx->prev_mono_time = th_ctx->curr_mono_time = before_poll_mono_ns;
gettimeofday(&date, NULL); gettimeofday(&date, NULL);
after_poll = before_poll = date; after_poll = before_poll = date;
global_now_ns = th_ctx->curr_mono_time; _global_now_ns = th_ctx->curr_mono_time;
if (!global_now_ns) // CLOCK_MONOTONIC not supported if (!_global_now_ns) // CLOCK_MONOTONIC not supported
global_now_ns = tv_to_ns(&date); _global_now_ns = tv_to_ns(&date);
now_ns = global_now_ns; now_ns = _global_now_ns;
_global_now_ms = ns_to_ms(now_ns); _global_now_ms = ns_to_ms(now_ns);
@ -337,8 +338,8 @@ void clock_init_process_date(void)
* match and continue from this shifted date. * match and continue from this shifted date.
*/ */
now_offset = sec_to_ns((uint)((uint)(-_global_now_ms) / 1000U - BOOT_TIME_WRAP_SEC)); now_offset = sec_to_ns((uint)((uint)(-_global_now_ms) / 1000U - BOOT_TIME_WRAP_SEC));
global_now_ns += now_offset; _global_now_ns += now_offset;
now_ns = global_now_ns; now_ns = _global_now_ns;
now_ms = ns_to_ms(now_ns); now_ms = ns_to_ms(now_ns);
/* correct for TICK_ETNERITY (0) */ /* correct for TICK_ETNERITY (0) */
if (now_ms == TICK_ETERNITY) if (now_ms == TICK_ETERNITY)
@ -347,6 +348,8 @@ void clock_init_process_date(void)
/* for now global_now_ms points to the process-local _global_now_ms */ /* for now global_now_ms points to the process-local _global_now_ms */
global_now_ms = &_global_now_ms; global_now_ms = &_global_now_ms;
/* same goes for global_ns_ns */
global_now_ns = &_global_now_ns;
th_ctx->idle_pct = 100; th_ctx->idle_pct = 100;
clock_update_date(0, 1); clock_update_date(0, 1);
@ -369,7 +372,7 @@ void clock_init_thread_date(void)
gettimeofday(&date, NULL); gettimeofday(&date, NULL);
after_poll = before_poll = date; after_poll = before_poll = date;
now_ns = _HA_ATOMIC_LOAD(&global_now_ns); now_ns = _HA_ATOMIC_LOAD(global_now_ns);
th_ctx->idle_pct = 100; th_ctx->idle_pct = 100;
th_ctx->prev_cpu_time = now_cpu_time(); th_ctx->prev_cpu_time = now_cpu_time();
th_ctx->prev_mono_time = now_mono_time(); th_ctx->prev_mono_time = now_mono_time();