upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 14:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

MINOR: poller: move the call of tv_update_date() back to the pollers

Browse source 
The reason behind this will be to be able to compute a timeout when
busy polling.
This commit is contained in:
Willy Tarreau 2018-11-22 18:57:37 +01:00
parent 744a08903e
commit 48f8bc1368
5 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/common/time.h
View file

@ -586,7 +586,6 @@ static inline void tv_entering_poll()
*/
static inline void tv_leaving_poll(int timeout, int interrupted)
{
tv_update_date(timeout, interrupted);
measure_idle();
prev_cpu_time = now_cpu_time();
prev_mono_time = now_mono_time();

1
src/ev_epoll.c
View file

@ -150,6 +150,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
tv_entering_poll();
activity_count_runtime();
status = epoll_wait(epoll_fd[tid], epoll_events, global.tune.maxpollevents, wait_time);
tv_update_date(wait_time, status);
tv_leaving_poll(wait_time, status);
thread_harmless_end();

1
src/ev_kqueue.c
View file

@ -143,6 +143,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
kev, // struct kevent *eventlist
fd, // int nevents
&timeout); // const struct timespec *timeout
tv_update_date(delta_ms, status);
tv_leaving_poll(delta_ms, status);
thread_harmless_end();

1
src/ev_poll.c
View file

@ -198,6 +198,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
tv_entering_poll();
activity_count_runtime();
status = poll(poll_events, nbfd, wait_time);
tv_update_date(wait_time, status);
tv_leaving_poll(wait_time, status);
thread_harmless_end();

1
src/ev_select.c
View file

@ -172,6 +172,7 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
writenotnull ? tmp_evts[DIR_WR] : NULL,
NULL,
&delta);
tv_update_date(delta_ms, status);
tv_leaving_poll(delta_ms, status);
thread_harmless_end();