Merge pull request #741 from Run/typo

[redis.git] / src / ae_epoll.c

diff --git a/src/ae_epoll.c b/src/ae_epoll.c
index 5680b6a2767617319e1d07732530553d1eb2457b..0231f24358f13b16f2cb675937228cb0e7006794 100644 (file)
--- a/src/ae_epoll.c
+++ b/src/ae_epoll.c
@@ -6,15 +6,21 @@
 
 typedef struct aeApiState {
     int epfd;
 
 typedef struct aeApiState {
     int epfd;

-    struct epoll_event events[AE_SETSIZE];
+    struct epoll_event *events;

 } aeApiState;
 
 static int aeApiCreate(aeEventLoop *eventLoop) {
     aeApiState *state = zmalloc(sizeof(aeApiState));
 
     if (!state) return -1;
 } aeApiState;
 
 static int aeApiCreate(aeEventLoop *eventLoop) {
     aeApiState *state = zmalloc(sizeof(aeApiState));
 
     if (!state) return -1;

+    state->events = zmalloc(sizeof(struct epoll_event)*eventLoop->setsize);
+    if (!state->events) {
+        zfree(state);
+        return -1;
+    }

     state->epfd = epoll_create(1024); /* 1024 is just an hint for the kernel */
     if (state->epfd == -1) {
     state->epfd = epoll_create(1024); /* 1024 is just an hint for the kernel */
     if (state->epfd == -1) {

+        zfree(state->events);

         zfree(state);
         return -1;
     }
         zfree(state);
         return -1;
     }


@@ -26,6 +32,7 @@ static void aeApiFree(aeEventLoop *eventLoop) {
     aeApiState *state = eventLoop->apidata;
 
     close(state->epfd);
     aeApiState *state = eventLoop->apidata;
 
     close(state->epfd);

+    zfree(state->events);

     zfree(state);
 }
 
     zfree(state);
 }
 


@@ -70,7 +77,7 @@ static int aeApiPoll(aeEventLoop *eventLoop, struct timeval *tvp) {
     aeApiState *state = eventLoop->apidata;
     int retval, numevents = 0;
 
     aeApiState *state = eventLoop->apidata;
     int retval, numevents = 0;
 

-    retval = epoll_wait(state->epfd,state->events,AE_SETSIZE,
+    retval = epoll_wait(state->epfd,state->events,eventLoop->setsize,

             tvp ? (tvp->tv_sec*1000 + tvp->tv_usec/1000) : -1);
     if (retval > 0) {
         int j;
             tvp ? (tvp->tv_sec*1000 + tvp->tv_usec/1000) : -1);
     if (retval > 0) {
         int j;


@@ -82,6 +89,8 @@ static int aeApiPoll(aeEventLoop *eventLoop, struct timeval *tvp) {
 
             if (e->events & EPOLLIN) mask |= AE_READABLE;
             if (e->events & EPOLLOUT) mask |= AE_WRITABLE;
 
             if (e->events & EPOLLIN) mask |= AE_READABLE;
             if (e->events & EPOLLOUT) mask |= AE_WRITABLE;

+            if (e->events & EPOLLERR) mask |= AE_WRITABLE;
+            if (e->events & EPOLLHUP) mask |= AE_WRITABLE;

             eventLoop->fired[j].fd = e->data.fd;
             eventLoop->fired[j].mask = mask;
         }
             eventLoop->fired[j].fd = e->data.fd;
             eventLoop->fired[j].mask = mask;
         }