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

BUG/MINOR: pollers: remove uneeded free in global init

Browse Source 
Since commit d4604adeaa ("MAJOR: threads/fd: Make fd stuffs
thread-safe"), we init pollers per thread using a helper. It was still
correct for mono-thread mode until commit cd7879adc2 ("BUG/MEDIUM:
threads: Run the poll loop on the main thread too"). We now use a deinit
helper for all threads, making those free uneeded.

Only poll and select are affected by this very minor issue.

it could be backported from v1.8 to v2.1.

Fixes: cd7879adc2 ("BUG/MEDIUM: threads: Run the poll loop on the main
thread too")
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
This commit is contained in:
William Dauchy 2020-05-11 15:20:03 +02:00 committed by Willy Tarreau
parent cece694bcc
commit 42a50bd19b
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ev_poll.c
View File

@ -286,7 +286,6 @@ static int _do_init(struct poller *p)
fail_swevt: fail_swevt:
free(fd_evts[DIR_RD]); free(fd_evts[DIR_RD]);
fail_srevt: fail_srevt:
free(poll_events);
p->pref = 0; p->pref = 0;
return 0; return 0;
} }

5
src/ev_select.c
View File

@ -255,7 +255,7 @@ static int _do_init(struct poller *p)
p->private = NULL; p->private = NULL;
if (global.maxsock > FD_SETSIZE) if (global.maxsock > FD_SETSIZE)
goto fail_revt; goto fail_srevt;
fd_set_bytes = sizeof(fd_set) * (global.maxsock + FD_SETSIZE - 1) / FD_SETSIZE; fd_set_bytes = sizeof(fd_set) * (global.maxsock + FD_SETSIZE - 1) / FD_SETSIZE;
@ -272,9 +272,6 @@ static int _do_init(struct poller *p)
fail_swevt: fail_swevt:
free(fd_evts[DIR_RD]); free(fd_evts[DIR_RD]);
fail_srevt: fail_srevt:
free(tmp_evts[DIR_WR]);
free(tmp_evts[DIR_RD]);
fail_revt:
p->pref = 0; p->pref = 0;
return 0; return 0;
} }