Update hiredis to 0.9.2

[redis.git] / deps / hiredis / adapters / libev.h

diff --git a/deps/hiredis/adapters/libev.h b/deps/hiredis/adapters/libev.h
index 79c069d925b2cb31f902339720c9eb7a7cb94443..3b9ed6560f5ed2cd7933e3584a09816c8a7f7569 100644 (file)
--- a/deps/hiredis/adapters/libev.h
+++ b/deps/hiredis/adapters/libev.h
@@ -10,69 +10,89 @@ typedef struct redisLibevEvents {
     ev_io rev, wev;
 } redisLibevEvents;
 
     ev_io rev, wev;
 } redisLibevEvents;
 

-void redisLibevReadEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
-    ((void)loop); ((void)revents);
-    redisLibevEvents *e = watcher->data;
+void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
+#if EV_MULTIPLICITY
+    ((void)loop);
+#endif
+    ((void)revents);
+
+    redisLibevEvents *e = (redisLibevEvents*)watcher->data;

     redisAsyncHandleRead(e->context);
 }
 
     redisAsyncHandleRead(e->context);
 }
 

-void redisLibevWriteEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
-    ((void)loop); ((void)revents);
-    redisLibevEvents *e = watcher->data;
+void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
+#if EV_MULTIPLICITY
+    ((void)loop);
+#endif
+    ((void)revents);
+
+    redisLibevEvents *e = (redisLibevEvents*)watcher->data;

     redisAsyncHandleWrite(e->context);
 }
 
 void redisLibevAddRead(void *privdata) {
     redisAsyncHandleWrite(e->context);
 }
 
 void redisLibevAddRead(void *privdata) {

-    redisLibevEvents *e = privdata;
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);

     if (!e->reading) {
         e->reading = 1;
     if (!e->reading) {
         e->reading = 1;

-        ev_io_start(e->loop,&e->rev);
+        ev_io_start(EV_A_ &e->rev);

     }
 }
 
 void redisLibevDelRead(void *privdata) {
     }
 }
 
 void redisLibevDelRead(void *privdata) {

-    redisLibevEvents *e = privdata;
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);

     if (e->reading) {
         e->reading = 0;
     if (e->reading) {
         e->reading = 0;

-        ev_io_stop(e->loop,&e->rev);
+        ev_io_stop(EV_A_ &e->rev);

     }
 }
 
 void redisLibevAddWrite(void *privdata) {
     }
 }
 
 void redisLibevAddWrite(void *privdata) {

-    redisLibevEvents *e = privdata;
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);

     if (!e->writing) {
         e->writing = 1;
     if (!e->writing) {
         e->writing = 1;

-        ev_io_start(e->loop,&e->wev);
+        ev_io_start(EV_A_ &e->wev);

     }
 }
 
 void redisLibevDelWrite(void *privdata) {
     }
 }
 
 void redisLibevDelWrite(void *privdata) {

-    redisLibevEvents *e = privdata;
+    redisLibevEvents *e = (redisLibevEvents*)privdata;
+    struct ev_loop *loop = e->loop;
+    ((void)loop);

     if (e->writing) {
         e->writing = 0;
     if (e->writing) {
         e->writing = 0;

-        ev_io_stop(e->loop,&e->wev);
+        ev_io_stop(EV_A_ &e->wev);

     }
 }
 
 void redisLibevCleanup(void *privdata) {
     }
 }
 
 void redisLibevCleanup(void *privdata) {

-    redisLibevEvents *e = privdata;
+    redisLibevEvents *e = (redisLibevEvents*)privdata;

     redisLibevDelRead(privdata);
     redisLibevDelWrite(privdata);
     free(e);
 }
 
     redisLibevDelRead(privdata);
     redisLibevDelWrite(privdata);
     free(e);
 }
 

-int redisLibevAttach(redisAsyncContext *ac, struct ev_loop *loop) {
+int redisLibevAttach(EV_P_ redisAsyncContext *ac) {

     redisContext *c = &(ac->c);
     redisLibevEvents *e;
 
     /* Nothing should be attached when something is already attached */
     redisContext *c = &(ac->c);
     redisLibevEvents *e;
 
     /* Nothing should be attached when something is already attached */

-    if (ac->data != NULL)
+    if (ac->_adapter_data != NULL)

         return REDIS_ERR;
 
     /* Create container for context and r/w events */
         return REDIS_ERR;
 
     /* Create container for context and r/w events */

-    e = malloc(sizeof(*e));
+    e = (redisLibevEvents*)malloc(sizeof(*e));

     e->context = ac;
     e->context = ac;

+#if EV_MULTIPLICITY

     e->loop = loop;
     e->loop = loop;

+#else
+    e->loop = NULL;
+#endif

     e->reading = e->writing = 0;
     e->rev.data = e;
     e->wev.data = e;
     e->reading = e->writing = 0;
     e->rev.data = e;
     e->wev.data = e;


@@ -83,10 +103,11 @@ int redisLibevAttach(redisAsyncContext *ac, struct ev_loop *loop) {
     ac->evAddWrite = redisLibevAddWrite;
     ac->evDelWrite = redisLibevDelWrite;
     ac->evCleanup = redisLibevCleanup;
     ac->evAddWrite = redisLibevAddWrite;
     ac->evDelWrite = redisLibevDelWrite;
     ac->evCleanup = redisLibevCleanup;

-    ac->data = e;
+    ac->_adapter_data = e;

 
     /* Initialize read/write events */
     ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
     ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
     return REDIS_OK;
 }
 
     /* Initialize read/write events */
     ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
     ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
     return REDIS_OK;
 }

+