Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / deps / hiredis / async.h

diff --git a/deps/hiredis/async.h b/deps/hiredis/async.h
index d0a99da703819166b7767cdc06d44d409bac996a..ba2b6f549114991ce74bacad534b38405f41ce34 100644 (file)
--- a/deps/hiredis/async.h
+++ b/deps/hiredis/async.h
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
 /*
  * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>

+ * Copyright (c) 2010, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -31,7 +33,12 @@
 #define __HIREDIS_ASYNC_H
 #include "hiredis.h"
 
 #define __HIREDIS_ASYNC_H
 #include "hiredis.h"
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+

 struct redisAsyncContext; /* need forward declaration of redisAsyncContext */
 struct redisAsyncContext; /* need forward declaration of redisAsyncContext */

+struct dict; /* dictionary header is included in async.c */

 
 /* Reply callback prototype and container */
 typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);
 
 /* Reply callback prototype and container */
 typedef void (redisCallbackFn)(struct redisAsyncContext*, void*, void*);


@@ -46,8 +53,9 @@ typedef struct redisCallbackList {
     redisCallback *head, *tail;
 } redisCallbackList;
 
     redisCallback *head, *tail;
 } redisCallbackList;
 

-/* Disconnect callback prototype */
+/* Connection callback prototypes */

 typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);
 typedef void (redisDisconnectCallback)(const struct redisAsyncContext*, int status);

+typedef void (redisConnectCallback)(const struct redisAsyncContext*);

 
 /* Context for an async connection to Redis */
 typedef struct redisAsyncContext {
 
 /* Context for an async connection to Redis */
 typedef struct redisAsyncContext {


@@ -58,28 +66,48 @@ typedef struct redisAsyncContext {
     int err;
     char *errstr;
 
     int err;
     char *errstr;
 

-    /* Called when the library expects to start reading/writing.
-     * The supplied functions should be idempotent. */
-    void (*evAddRead)(void *privdata);
-    void (*evDelRead)(void *privdata);
-    void (*evAddWrite)(void *privdata);
-    void (*evDelWrite)(void *privdata);
-    void (*evCleanup)(void *privdata);
+    /* Not used by hiredis */

     void *data;
 
     void *data;
 

+    /* Event library data and hooks */
+    struct {
+        void *data;
+
+        /* Hooks that are called when the library expects to start
+         * reading/writing. These functions should be idempotent. */
+        void (*addRead)(void *privdata);
+        void (*delRead)(void *privdata);
+        void (*addWrite)(void *privdata);
+        void (*delWrite)(void *privdata);
+        void (*cleanup)(void *privdata);
+    } ev;
+

     /* Called when either the connection is terminated due to an error or per
      * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
     redisDisconnectCallback *onDisconnect;
 
     /* Called when either the connection is terminated due to an error or per
      * user request. The status is set accordingly (REDIS_OK, REDIS_ERR). */
     redisDisconnectCallback *onDisconnect;
 

-    /* Reply callbacks */
+    /* Called when the first write event was received. */
+    redisConnectCallback *onConnect;
+
+    /* Regular command callbacks */

     redisCallbackList replies;
     redisCallbackList replies;

+
+    /* Subscription callbacks */
+    struct {
+        redisCallbackList invalid;
+        struct dict *channels;
+        struct dict *patterns;
+    } sub;

 } redisAsyncContext;
 
 /* Functions that proxy to hiredis */
 redisAsyncContext *redisAsyncConnect(const char *ip, int port);
 } redisAsyncContext;
 
 /* Functions that proxy to hiredis */
 redisAsyncContext *redisAsyncConnect(const char *ip, int port);

+redisAsyncContext *redisAsyncConnectUnix(const char *path);

 int redisAsyncSetReplyObjectFunctions(redisAsyncContext *ac, redisReplyObjectFunctions *fn);
 int redisAsyncSetReplyObjectFunctions(redisAsyncContext *ac, redisReplyObjectFunctions *fn);

+int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn);

 int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
 void redisAsyncDisconnect(redisAsyncContext *ac);
 int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn);
 void redisAsyncDisconnect(redisAsyncContext *ac);

+void redisAsyncFree(redisAsyncContext *ac);

 
 /* Handle read/write events */
 void redisAsyncHandleRead(redisAsyncContext *ac);
 
 /* Handle read/write events */
 void redisAsyncHandleRead(redisAsyncContext *ac);


@@ -91,4 +119,8 @@ int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdat
 int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
 int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
 
 int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
 int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
 

+#ifdef __cplusplus
+}
+#endif
+

 #endif
 #endif