r22964: log an error on epoll_create failing on reopen

(This used to be commit a69f28599845d3ea3868a574c6b0ba8db8486ef5)

diff --git a/source4/lib/events/events_aio.c b/source4/lib/events/events_aio.c
index 68109d7265e9aa25d318112984e82fd9ba55f572..e78487547f02b2c0d311dd9609d48b8428e8d960 100644 (file)
--- a/source4/lib/events/events_aio.c
+++ b/source4/lib/events/events_aio.c
@@ -108,8 +108,9 @@ static void epoll_reopen(struct aio_event_context *aio_ev)
        struct fd_event *fde;
 
        close(aio_ev->epoll_fd);
-       aio_ev->epoll_fd = epoll_create(64);
+       aio_ev->epoll_fd = epoll_create(MAX_AIO_QUEUE_DEPTH);
        if (aio_ev->epoll_fd == -1) {
+               DEBUG(0,("Failed to recreate epoll handle after fork\n"));
                return;
        }
        aio_ev->pid = getpid();

diff --git a/source4/lib/events/events_epoll.c b/source4/lib/events/events_epoll.c
index cfea8363abbd72c064b69051f03859e746fcbe4d..5b6266fb490217a49f223750f00bb6817e7f76ec 100644 (file)
--- a/source4/lib/events/events_epoll.c
+++ b/source4/lib/events/events_epoll.c
@@ -109,6 +109,7 @@ static void epoll_reopen(struct epoll_event_context *epoll_ev)
        close(epoll_ev->epoll_fd);
        epoll_ev->epoll_fd = epoll_create(64);
        if (epoll_ev->epoll_fd == -1) {
+               DEBUG(0,("Failed to recreate epoll handle after fork\n"));
                return;
        }
        epoll_ev->pid = getpid();

diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index bae4d69688e8c2a7a69c7c0d143aba3f147cb894..50ba4ed79f018236967626a6020ceda79f9d067d 100644 (file)
--- a/source4/lib/events/events_standard.c
+++ b/source4/lib/events/events_standard.c
@@ -126,6 +126,7 @@ static void epoll_reopen(struct std_event_context *std_ev)
        close(std_ev->epoll_fd);
        std_ev->epoll_fd = epoll_create(64);
        if (std_ev->epoll_fd == -1) {
+               DEBUG(0,("Failed to recreate epoll handle after fork\n"));
                return;
        }
        std_ev->pid = getpid();