Scripting: add helper functions redis.error_reply() and redis.status_reply().

[redis.git] / src / ae_epoll.c

diff --git a/src/ae_epoll.c b/src/ae_epoll.c
index fc6d9ccddc0120fd25f5b19649fbc6de9a911e6f..0231f24358f13b16f2cb675937228cb0e7006794 100644 (file)
--- a/src/ae_epoll.c
+++ b/src/ae_epoll.c
@@ -13,7 +13,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
     aeApiState *state = zmalloc(sizeof(aeApiState));
 
     if (!state) return -1;
     aeApiState *state = zmalloc(sizeof(aeApiState));
 
     if (!state) return -1;

-    state->events = zmalloc(sizeof(epoll_event)*eventLoop->setsize);
+    state->events = zmalloc(sizeof(struct epoll_event)*eventLoop->setsize);

     if (!state->events) {
         zfree(state);
         return -1;
     if (!state->events) {
         zfree(state);
         return -1;


@@ -89,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;
         }