mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-16 22:31:42 +01:00
Code Issues Projects Releases Wiki Activity

[BUG] O(1) pollers should check their FD before closing it

Browse Source 
[cherry-picked from commit d79e79b436144654d10124de7d5fd4c896ac0487]

epoll, sepoll and kqueue pollers should check that their fd is not
closed before attempting to close it, otherwise we can end up with
multiple closes of fd #0 upon exit, which is harmless but dirty.
This commit is contained in:
Willy Tarreau 2009-05-10 10:18:54 +02:00
parent 2d03f9e1b5
commit 0d27ec2050
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ev_epoll.c
View File

@ -308,7 +308,7 @@ REGPRM1 static int _do_init(struct poller *p)
free(epoll_events);
fail_ee:
close(epoll_fd);
epoll_fd = 0;
epoll_fd = -1;
fail_fd:
p->pref = 0;
return 0;
@ -331,8 +331,10 @@ REGPRM1 static void _do_term(struct poller *p)
if (epoll_events)
free(epoll_events);
close(epoll_fd);
epoll_fd = 0;
if (epoll_fd >= 0) {
close(epoll_fd);
epoll_fd = -1;
}
chg_ptr = NULL;
chg_list = NULL;
@ -366,7 +368,8 @@ REGPRM1 static int _do_test(struct poller *p)
*/
REGPRM1 static int _do_fork(struct poller *p)
{
close(epoll_fd);
if (epoll_fd >= 0)
close(epoll_fd);
epoll_fd = epoll_create(global.maxsock + 1);
if (epoll_fd < 0)
return 0;
@ -385,6 +388,8 @@ static void _do_register(void)
if (nbpollers >= MAX_POLLERS)
return;
epoll_fd = -1;
p = &pollers[nbpollers++];
p->name = "epoll";

14
src/ev_kqueue.c
View File

@ -186,7 +186,7 @@ REGPRM1 static int _do_init(struct poller *p)
free(kev);
fail_kev:
close(kqueue_fd);
kqueue_fd = 0;
kqueue_fd = -1;
fail_fd:
p->pref = 0;
return 0;
@ -204,8 +204,11 @@ REGPRM1 static void _do_term(struct poller *p)
free(fd_evts[DIR_RD]);
if (kev)
free(kev);
close(kqueue_fd);
kqueue_fd = 0;
if (kqueue_fd >= 0) {
close(kqueue_fd);
kqueue_fd = -1;
}
p->private = NULL;
p->pref = 0;
@ -233,7 +236,8 @@ REGPRM1 static int _do_test(struct poller *p)
*/
REGPRM1 static int _do_fork(struct poller *p)
{
close(kqueue_fd);
if (kqueue_fd >= 0)
close(kqueue_fd);
kqueue_fd = kqueue();
if (kqueue_fd < 0)
return 0;
@ -252,6 +256,8 @@ static void _do_register(void)
if (nbpollers >= MAX_POLLERS)
return;
kqueue_fd = -1;
p = &pollers[nbpollers++];
p->name = "kqueue";

13
src/ev_sepoll.c
View File

@ -526,7 +526,7 @@ REGPRM1 static int _do_init(struct poller *p)
free(epoll_events);
fail_ee:
close(epoll_fd);
epoll_fd = 0;
epoll_fd = -1;
fail_fd:
p->pref = 0;
return 0;
@ -545,8 +545,10 @@ REGPRM1 static void _do_term(struct poller *p)
if (epoll_events)
free(epoll_events);
close(epoll_fd);
epoll_fd = 0;
if (epoll_fd >= 0) {
close(epoll_fd);
epoll_fd = -1;
}
fd_list = NULL;
spec_list = NULL;
@ -579,7 +581,8 @@ REGPRM1 static int _do_test(struct poller *p)
*/
REGPRM1 static int _do_fork(struct poller *p)
{
close(epoll_fd);
if (epoll_fd >= 0)
close(epoll_fd);
epoll_fd = epoll_create(global.maxsock + 1);
if (epoll_fd < 0)
return 0;
@ -598,6 +601,8 @@ static void _do_register(void)
if (nbpollers >= MAX_POLLERS)
return;
epoll_fd = -1;
p = &pollers[nbpollers++];
p->name = "sepoll";