publish/subscribe/unsubscribe implementation, fiw warnings

nasr · nasr · commit 43b43fce7bf3 · 2010-06-11T13:31:50.000+02:00
diff --git a/library.c b/library.c
@@ -13,6 +13,28 @@ PHPAPI void redis_check_eof(RedisSock *redis_sock TSRMLS_DC)
     }
 }
 
+PHPAPI zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS,
+												  RedisSock *redis_sock TSRMLS_DC) {
+    char inbuf[1024], *response;
+    int response_len;
+
+    redis_check_eof(redis_sock TSRMLS_CC);
+    php_stream_gets(redis_sock->stream, inbuf, 1024);
+
+    if(inbuf[0] != '*') {
+        return NULL;
+    }
+    int numElems = atoi(inbuf+1);
+
+    zval *z_tab;
+    MAKE_STD_ZVAL(z_tab);
+    array_init(z_tab);
+
+    redis_sock_read_multibulk_reply_loop(INTERNAL_FUNCTION_PARAM_PASSTHRU,
+                    redis_sock, z_tab, numElems);
+	return z_tab;
+}
+
 /**
  * redis_sock_read_bulk_reply
  */
diff --git a/library.h b/library.h
@@ -14,6 +14,7 @@ PHPAPI RedisSock* redis_sock_create(char *host, int host_len, unsigned short por
 PHPAPI int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC);
 PHPAPI int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC);
 PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC);
+PHPAPI zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock TSRMLS_DC);
 PHPAPI char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes);
 PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *_z_tab TSRMLS_DC);
 PHPAPI int redis_sock_read_multibulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, int numElems TSRMLS_DC);
diff --git a/php_redis.h b/php_redis.h
@@ -110,6 +110,10 @@ PHP_METHOD(Redis, exec);
 
 PHP_METHOD(Redis, pipeline);
 
+PHP_METHOD(Redis, publish);
+PHP_METHOD(Redis, subscribe);
+PHP_METHOD(Redis, unsubscribe);
+
 #ifdef PHP_WIN32
 #define PHP_REDIS_API __declspec(dllexport)
 #else
diff --git a/redis.c b/redis.c
