From: Willy Tarreau Date: Fri, 8 Oct 2021 09:38:30 +0000 (+0200) Subject: CLEANUP: clock: stop exporting before_poll and after_poll X-Git-Tag: v2.5-dev9~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c6a998727bc5e322a58593f64bdffa2cd21999c;p=thirdparty%2Fhaproxy.git CLEANUP: clock: stop exporting before_poll and after_poll We don't need to export them anymore so let's make them static. --- diff --git a/include/haproxy/clock.h b/include/haproxy/clock.h index 448b0c8d08..73d4ef37c2 100644 --- a/include/haproxy/clock.h +++ b/include/haproxy/clock.h @@ -31,8 +31,6 @@ extern volatile ullong global_now; /* common monotonic date betwe extern THREAD_LOCAL struct timeval now; /* internal monotonic date derived from real clock */ extern THREAD_LOCAL struct timeval date; /* the real current date (wall-clock time) */ -extern THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */ -extern THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */ uint64_t now_cpu_time_thread(const struct thread_info *thr); uint64_t now_mono_time(void); diff --git a/src/clock.c b/src/clock.c index cd5ead7b44..ccb59c3cb3 100644 --- a/src/clock.c +++ b/src/clock.c @@ -29,9 +29,9 @@ THREAD_ALIGNED(64) static ullong now_offset; /* global offset between syste THREAD_LOCAL uint now_ms; /* internal monotonic date in milliseconds (may wrap) */ THREAD_LOCAL struct timeval now; /* internal monotonic date derived from real clock */ THREAD_LOCAL struct timeval date; /* the real current date (wall-clock time) */ -THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */ -THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */ +static THREAD_LOCAL struct timeval before_poll; /* system date before calling poll() */ +static THREAD_LOCAL struct timeval after_poll; /* system date after leaving poll() */ static THREAD_LOCAL unsigned int samp_time; /* total elapsed time over current sample */ static THREAD_LOCAL unsigned int idle_time; /* total idle time over current sample */ static THREAD_LOCAL unsigned int iso_time_sec; /* last iso time value for this thread */