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

MAJOR: pollers: rely on fd_reregister_all() at boot time

Browse Source 
The poller-specific thread init code now uses that new function to
safely register boot events. This ensures that we don't register an
event for another group and that we properly deal with parallel
thread startup.

It's only done for thread-aware pollers, there's no point in using
that in poll/select though that should work as well.
This commit is contained in:
Willy Tarreau 2022-07-09 23:23:50 +02:00
parent 9baff4ffd9
commit d95f18fa39
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ev_epoll.c
View File

@ -250,8 +250,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
static int init_epoll_per_thread() static int init_epoll_per_thread()
{ {
int fd;
epoll_events = calloc(1, sizeof(struct epoll_event) * global.tune.maxpollevents); epoll_events = calloc(1, sizeof(struct epoll_event) * global.tune.maxpollevents);
if (epoll_events == NULL) if (epoll_events == NULL)
goto fail_alloc; goto fail_alloc;
@ -267,8 +265,7 @@ static int init_epoll_per_thread()
* fd for this thread. Let's just mark them as updated, the poller will * fd for this thread. Let's just mark them as updated, the poller will
* do the rest. * do the rest.
*/ */
for (fd = 0; fd < global.maxsock; fd++) fd_reregister_all(tgid, ti->ltid_bit);
updt_fd_polling(fd);
return 1; return 1;
fail_fd: fail_fd:

5
src/ev_evports.c
View File

@ -279,8 +279,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
static int init_evports_per_thread() static int init_evports_per_thread()
{ {
int fd;
evports_evlist_max = global.tune.maxpollevents; evports_evlist_max = global.tune.maxpollevents;
evports_evlist = calloc(evports_evlist_max, sizeof(*evports_evlist)); evports_evlist = calloc(evports_evlist_max, sizeof(*evports_evlist));
if (evports_evlist == NULL) { if (evports_evlist == NULL) {
@ -298,8 +296,7 @@ static int init_evports_per_thread()
* fd for this thread. Let's just mark them as updated, the poller will * fd for this thread. Let's just mark them as updated, the poller will
* do the rest. * do the rest.
*/ */
for (fd = 0; fd < global.maxsock; fd++) fd_reregister_all(tgid, ti->ltid_bit);
updt_fd_polling(fd);
return 1; return 1;

5
src/ev_kqueue.c
View File

@ -205,8 +205,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
static int init_kqueue_per_thread() static int init_kqueue_per_thread()
{ {
int fd;
/* we can have up to two events per fd, so allocate enough to store /* we can have up to two events per fd, so allocate enough to store
* 2*fd event, and an extra one, in case EV_RECEIPT isn't defined, * 2*fd event, and an extra one, in case EV_RECEIPT isn't defined,
* so that we can add an invalid entry and get an error, to avoid * so that we can add an invalid entry and get an error, to avoid
@ -227,8 +225,7 @@ static int init_kqueue_per_thread()
* fd for this thread. Let's just mark them as updated, the poller will * fd for this thread. Let's just mark them as updated, the poller will
* do the rest. * do the rest.
*/ */
for (fd = 0; fd < global.maxsock; fd++) fd_reregister_all(tgid, ti->ltid_bit);
updt_fd_polling(fd);
return 1; return 1;
fail_fd: fail_fd: