MINOR: polling: make epoll and kqueue not depend on maxfd anymore
Maxfd is really only useful to poll() and select(), yet epoll and
kqueue reference it almost by mistake :
- cloning of the initial FDs (maxsock should be used here)
- max polled events, it's maxpollevents which should be used here.
Let's fix these places.
diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index e5c0001..baa6770 100644
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -206,7 +206,7 @@
* fd for this thread. Let's just mark them as updated, the poller will
* do the rest.
*/
- for (fd = 0; fd < maxfd; fd++)
+ for (fd = 0; fd < global.maxsock; fd++)
updt_fd_polling(fd);
return 1;
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 86731af..0346ec4 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -110,7 +110,7 @@
else
activity[tid].poll_exp++;
- fd = MIN(maxfd, global.tune.maxpollevents);
+ fd = global.tune.maxpollevents;
gettimeofday(&before_poll, NULL);
status = kevent(kqueue_fd[tid], // int kq
NULL, // const struct kevent *changelist
@@ -172,7 +172,7 @@
* fd for this thread. Let's just mark them as updated, the poller will
* do the rest.
*/
- for (fd = 0; fd < maxfd; fd++)
+ for (fd = 0; fd < global.maxsock; fd++)
updt_fd_polling(fd);
return 1;
diff --git a/src/fd.c b/src/fd.c
index b64130e..4397f6e 100644
--- a/src/fd.c
+++ b/src/fd.c
@@ -457,7 +457,7 @@
int fork_poller()
{
int fd;
- for (fd = 0; fd <= maxfd; fd++) {
+ for (fd = 0; fd < global.maxsock; fd++) {
if (fdtab[fd].owner) {
fdtab[fd].cloned = 1;
}