Enabled object encoding for multiple keys in MSET. Added a test for memory leaks...

[redis.git] / ae_epoll.c

diff --git a/ae_epoll.c b/ae_epoll.c
index b63b74b51f251e919d9ad471a1cba36ee445a8db..8fb5d4c38aafd6ea0be50e49d87e8d1a9111fb8d 100644 (file)
--- a/ae_epoll.c
+++ b/ae_epoll.c
@@ -36,6 +36,7 @@ static int aeApiAddEvent(aeEventLoop *eventLoop, int fd, int mask) {
     if (mask & AE_READABLE) ee.events |= EPOLLIN;
     if (mask & AE_WRITABLE) ee.events |= EPOLLOUT;
     if (mask & AE_EXCEPTION) ee.events |= EPOLLPRI;
     if (mask & AE_READABLE) ee.events |= EPOLLIN;
     if (mask & AE_WRITABLE) ee.events |= EPOLLOUT;
     if (mask & AE_EXCEPTION) ee.events |= EPOLLPRI;

+    ee.data.u64 = 0; /* avoid valgrind warning */

     ee.data.fd = fd;
     if (epoll_ctl(state->epfd,op,fd,&ee) == -1) return -1;
     return 0;
     ee.data.fd = fd;
     if (epoll_ctl(state->epfd,op,fd,&ee) == -1) return -1;
     return 0;


@@ -50,6 +51,7 @@ static void aeApiDelEvent(aeEventLoop *eventLoop, int fd, int delmask) {
     if (mask & AE_READABLE) ee.events |= EPOLLIN;
     if (mask & AE_WRITABLE) ee.events |= EPOLLOUT;
     if (mask & AE_EXCEPTION) ee.events |= EPOLLPRI;
     if (mask & AE_READABLE) ee.events |= EPOLLIN;
     if (mask & AE_WRITABLE) ee.events |= EPOLLOUT;
     if (mask & AE_EXCEPTION) ee.events |= EPOLLPRI;

+    ee.data.u64 = 0; /* avoid valgrind warning */

     ee.data.fd = fd;
     if (mask != AE_NONE) {
         epoll_ctl(state->epfd,EPOLL_CTL_MOD,fd,&ee);
     ee.data.fd = fd;
     if (mask != AE_NONE) {
         epoll_ctl(state->epfd,EPOLL_CTL_MOD,fd,&ee);