Test "Turning off AOF kills the background writing child if any" is now more reliable.

[redis.git] / src / ae.c

diff --git a/src/ae.c b/src/ae.c
index 0580289002dfa72db5d1d267f13f27f0f02438d9..668277a78087c102627b15107c35f7876d0035c0 100644 (file)
--- a/src/ae.c
+++ b/src/ae.c
@@ -35,6 +35,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>

+#include <poll.h>
+#include <string.h>

 
 #include "ae.h"
 #include "zmalloc.h"
 
 #include "ae.h"
 #include "zmalloc.h"


@@ -52,30 +54,40 @@
     #endif
 #endif
 
     #endif
 #endif
 

-aeEventLoop *aeCreateEventLoop(void) {
+aeEventLoop *aeCreateEventLoop(int setsize) {

     aeEventLoop *eventLoop;
     int i;
 
     aeEventLoop *eventLoop;
     int i;
 

-    eventLoop = zmalloc(sizeof(*eventLoop));
-    if (!eventLoop) return NULL;
+    if ((eventLoop = zmalloc(sizeof(*eventLoop))) == NULL) goto err;
+    eventLoop->events = zmalloc(sizeof(aeFileEvent)*setsize);
+    eventLoop->fired = zmalloc(sizeof(aeFiredEvent)*setsize);
+    if (eventLoop->events == NULL || eventLoop->fired == NULL) goto err;
+    eventLoop->setsize = setsize;

     eventLoop->timeEventHead = NULL;
     eventLoop->timeEventNextId = 0;
     eventLoop->stop = 0;
     eventLoop->maxfd = -1;
     eventLoop->beforesleep = NULL;
     eventLoop->timeEventHead = NULL;
     eventLoop->timeEventNextId = 0;
     eventLoop->stop = 0;
     eventLoop->maxfd = -1;
     eventLoop->beforesleep = NULL;

-    if (aeApiCreate(eventLoop) == -1) {
-        zfree(eventLoop);
-        return NULL;
-    }
+    if (aeApiCreate(eventLoop) == -1) goto err;

     /* Events with mask == AE_NONE are not set. So let's initialize the
      * vector with it. */
     /* Events with mask == AE_NONE are not set. So let's initialize the
      * vector with it. */

-    for (i = 0; i < AE_SETSIZE; i++)
+    for (i = 0; i < setsize; i++)

         eventLoop->events[i].mask = AE_NONE;
     return eventLoop;
         eventLoop->events[i].mask = AE_NONE;
     return eventLoop;

+
+err:
+    if (eventLoop) {
+        zfree(eventLoop->events);
+        zfree(eventLoop->fired);
+        zfree(eventLoop);
+    }
+    return NULL;

 }
 
 void aeDeleteEventLoop(aeEventLoop *eventLoop) {
     aeApiFree(eventLoop);
 }
 
 void aeDeleteEventLoop(aeEventLoop *eventLoop) {
     aeApiFree(eventLoop);

+    zfree(eventLoop->events);
+    zfree(eventLoop->fired);

     zfree(eventLoop);
 }
 
     zfree(eventLoop);
 }
 


@@ -86,7 +98,7 @@ void aeStop(aeEventLoop *eventLoop) {
 int aeCreateFileEvent(aeEventLoop *eventLoop, int fd, int mask,
         aeFileProc *proc, void *clientData)
 {
 int aeCreateFileEvent(aeEventLoop *eventLoop, int fd, int mask,
         aeFileProc *proc, void *clientData)
 {

-    if (fd >= AE_SETSIZE) return AE_ERR;
+    if (fd >= eventLoop->setsize) return AE_ERR;

     aeFileEvent *fe = &eventLoop->events[fd];
 
     if (aeApiAddEvent(eventLoop, fd, mask) == -1)
     aeFileEvent *fe = &eventLoop->events[fd];
 
     if (aeApiAddEvent(eventLoop, fd, mask) == -1)


@@ -102,7 +114,7 @@ int aeCreateFileEvent(aeEventLoop *eventLoop, int fd, int mask,
 
 void aeDeleteFileEvent(aeEventLoop *eventLoop, int fd, int mask)
 {
 
 void aeDeleteFileEvent(aeEventLoop *eventLoop, int fd, int mask)
 {

-    if (fd >= AE_SETSIZE) return;
+    if (fd >= eventLoop->setsize) return;

     aeFileEvent *fe = &eventLoop->events[fd];
 
     if (fe->mask == AE_NONE) return;
     aeFileEvent *fe = &eventLoop->events[fd];
 
     if (fe->mask == AE_NONE) return;


@@ -119,7 +131,7 @@ void aeDeleteFileEvent(aeEventLoop *eventLoop, int fd, int mask)
 }
 
 int aeGetFileEvents(aeEventLoop *eventLoop, int fd) {
 }
 
 int aeGetFileEvents(aeEventLoop *eventLoop, int fd) {

-    if (fd >= AE_SETSIZE) return 0;
+    if (fd >= eventLoop->setsize) return 0;

     aeFileEvent *fe = &eventLoop->events[fd];
 
     return fe->mask;
     aeFileEvent *fe = &eventLoop->events[fd];
 
     return fe->mask;


@@ -358,21 +370,17 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags)
 /* Wait for millseconds until the given file descriptor becomes
  * writable/readable/exception */
 int aeWait(int fd, int mask, long long milliseconds) {
 /* Wait for millseconds until the given file descriptor becomes
  * writable/readable/exception */
 int aeWait(int fd, int mask, long long milliseconds) {

-    struct timeval tv;
-    fd_set rfds, wfds, efds;
+    struct pollfd pfd;

     int retmask = 0, retval;
 
     int retmask = 0, retval;
 

-    tv.tv_sec = milliseconds/1000;
-    tv.tv_usec = (milliseconds%1000)*1000;
-    FD_ZERO(&rfds);
-    FD_ZERO(&wfds);
-    FD_ZERO(&efds);
-
-    if (mask & AE_READABLE) FD_SET(fd,&rfds);
-    if (mask & AE_WRITABLE) FD_SET(fd,&wfds);
-    if ((retval = select(fd+1, &rfds, &wfds, &efds, &tv)) > 0) {
-        if (FD_ISSET(fd,&rfds)) retmask |= AE_READABLE;
-        if (FD_ISSET(fd,&wfds)) retmask |= AE_WRITABLE;
+    memset(&pfd, 0, sizeof(pfd));
+    pfd.fd = fd;
+    if (mask & AE_READABLE) pfd.events |= POLLIN;
+    if (mask & AE_WRITABLE) pfd.events |= POLLOUT;
+
+    if ((retval = poll(&pfd, 1, milliseconds))== 1) {
+        if (pfd.revents & POLLIN) retmask |= AE_READABLE;
+        if (pfd.revents & POLLOUT) retmask |= AE_WRITABLE;

         return retmask;
     } else {
         return retval;
         return retmask;
     } else {
         return retval;