1 files changed, 60 insertions, 60 deletions

diff --git a/extra/hiredis/libev.h b/extra/hiredis/libev.h
index 3246820..fcb7c24 100644
--- a/extra/hiredis/libev.h
+++ b/extra/hiredis/libev.h
@@ -1,92 +1,92 @@
 #include <sys/types.h>
 #include <ev.h>
 #include <hiredis.h>
+#include <async.h>
 
-/* Prototype for the error callback. */
-typedef void (redisErrorCallback)(const redisContext*);
-
-typedef struct libevRedisEvents {
-    redisContext *context;
-    redisErrorCallback *err;
+typedef struct redisLibevEvents {
+    redisAsyncContext *context;
     struct ev_loop *loop;
+    int reading, writing;
     ev_io rev, wev;
-} libevRedisEvents;
+} redisLibevEvents;
 
-void libevRedisReadEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
+void redisLibevReadEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
     ((void)loop); ((void)revents);
-    libevRedisEvents *e = watcher->data;
-
-    if (redisBufferRead(e->context) == REDIS_ERR) {
-        redisDisconnect(e->context);
-        e->err(e->context);
-    } else {
-        if (redisProcessCallbacks(e->context) == REDIS_ERR) {
-            redisDisconnect(e->context);
-            e->err(e->context);
-        }
-    }
+    redisLibevEvents *e = watcher->data;
+    redisAsyncHandleRead(e->context);
 }
 
-void libevRedisWriteEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
+void redisLibevWriteEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
     ((void)loop); ((void)revents);
-    libevRedisEvents *e = watcher->data;
-    int done = 0;
+    redisLibevEvents *e = watcher->data;
+    redisAsyncHandleWrite(e->context);
+}
 
-    if (redisBufferWrite(e->context, &done) == REDIS_ERR) {
-        redisDisconnect(e->context);
-        e->err(e->context);
-    } else {
-        /* Stop firing the write event when done */
-        if (done) {
-            ev_io_stop(e->loop,&e->wev);
-            ev_io_start(e->loop,&e->rev);
-        }
+void redisLibevAddRead(void *privdata) {
+    redisLibevEvents *e = privdata;
+    if (!e->reading) {
+        e->reading = 1;
+        ev_io_start(e->loop,&e->rev);
     }
 }
 
-void libevRedisCommandCallback(redisContext *c, void *privdata) {
-    ((void)c);
-    libevRedisEvents *e = privdata;
-    ev_io_start(e->loop,&e->wev);
+void redisLibevDelRead(void *privdata) {
+    redisLibevEvents *e = privdata;
+    if (e->reading) {
+        e->reading = 0;
+        ev_io_stop(e->loop,&e->rev);
+    }
 }
 
-void libevRedisDisconnectCallback(redisContext *c, void *privdata) {
-    ((void)c);
-    libevRedisEvents *e = privdata;
-    ev_io_stop(e->loop,&e->rev);
-    ev_io_stop(e->loop,&e->wev);
+void redisLibevAddWrite(void *privdata) {
+    redisLibevEvents *e = privdata;
+    if (!e->writing) {
+        e->writing = 1;
+        ev_io_start(e->loop,&e->wev);
+    }
 }
 
-void libevRedisFreeCallback(redisContext *c, void *privdata) {
-    ((void)c);
-    libevRedisEvents *e = privdata;
+void redisLibevDelWrite(void *privdata) {
+    redisLibevEvents *e = privdata;
+    if (e->writing) {
+        e->writing = 0;
+        ev_io_stop(e->loop,&e->wev);
+    }
+}
+
+void redisLibevCleanup(void *privdata) {
+    redisLibevEvents *e = privdata;
+    redisLibevDelRead(privdata);
+    redisLibevDelWrite(privdata);
     free(e);
 }
 
-redisContext *libevRedisConnect(struct ev_loop *loop, redisErrorCallback *err, const char *ip, int port) {
-    libevRedisEvents *e;
-    redisContext *c = redisConnectNonBlock(ip, port, NULL);
-    if (c->error != NULL) {
-        err(c);
-        redisFree(c);
-        return NULL;
-    }
+int redisLibevAttach(redisAsyncContext *ac, struct ev_loop *loop) {
+    redisContext *c = &(ac->c);
+    redisLibevEvents *e;
+
+    /* Nothing should be attached when something is already attached */
+    if (ac->data != NULL)
+        return REDIS_ERR;
 
     /* Create container for context and r/w events */
     e = malloc(sizeof(*e));
-    e->context = c;
-    e->err = err;
+    e->context = ac;
     e->loop = loop;
+    e->reading = e->writing = 0;
     e->rev.data = e;
     e->wev.data = e;
 
-    /* Register callbacks */
-    redisSetDisconnectCallback(c,libevRedisDisconnectCallback,e);
-    redisSetCommandCallback(c,libevRedisCommandCallback,e);
-    redisSetFreeCallback(c,libevRedisFreeCallback,e);
+    /* Register functions to start/stop listening for events */
+    ac->evAddRead = redisLibevAddRead;
+    ac->evDelRead = redisLibevDelRead;
+    ac->evAddWrite = redisLibevAddWrite;
+    ac->evDelWrite = redisLibevDelWrite;
+    ac->evCleanup = redisLibevCleanup;
+    ac->data = e;
 
     /* Initialize read/write events */
-    ev_io_init(&e->rev,libevRedisReadEvent,c->fd,EV_READ);
-    ev_io_init(&e->wev,libevRedisWriteEvent,c->fd,EV_WRITE);
-    return c;
+    ev_io_init(&e->rev,redisLibevReadEvent,c->fd,EV_READ);
+    ev_io_init(&e->wev,redisLibevWriteEvent,c->fd,EV_WRITE);
+    return REDIS_OK;
 }