BUG/MINOR: pollers: remove uneeded free in global init
Since commit d4604adeaa8c ("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 cd7879adc2c4 ("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: cd7879adc2c4 ("BUG/MEDIUM: threads: Run the poll loop on the main
thread too")
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
(cherry picked from commit 42a50bd19be38962944377c73a7dc496fbd3bbc1)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 7e3e459e2f401cce42d7efdff89274c0c2770d7e)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/ev_poll.c b/src/ev_poll.c
index 54812f5..86bf8e8 100644
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -284,7 +284,6 @@
fail_swevt:
free(fd_evts[DIR_RD]);
fail_srevt:
- free(poll_events);
p->pref = 0;
return 0;
}
diff --git a/src/ev_select.c b/src/ev_select.c
index 0ccf2f1..dab932b 100644
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -243,7 +243,7 @@
p->private = NULL;
if (global.maxsock > FD_SETSIZE)
- goto fail_revt;
+ goto fail_srevt;
fd_set_bytes = sizeof(fd_set) * (global.maxsock + FD_SETSIZE - 1) / FD_SETSIZE;
@@ -260,9 +260,6 @@
fail_swevt:
free(fd_evts[DIR_RD]);
fail_srevt:
- free(tmp_evts[DIR_WR]);
- free(tmp_evts[DIR_RD]);
- fail_revt:
p->pref = 0;
return 0;
}