Merge remote branch 'pietern/networking-perf'

diff --git a/src/networking.c b/src/networking.c
index 96ce5a99712ec3f21a655cd49cb77af2650b5386..aefbc2d7e050ffe6f1d12db9659f1331a034c2c9 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -11,11 +11,7 @@ int listMatchObjects(void *a, void *b) {
 }
 
 redisClient *createClient(int fd) {
-    redisClient *c;
-
-    /* Allocate more space to hold a static write buffer. */
-    c = zmalloc(sizeof(redisClient)+REDIS_REPLY_CHUNK_BYTES);
-    c->buflen = REDIS_REPLY_CHUNK_BYTES;
+    redisClient *c = zmalloc(sizeof(redisClient));
     c->bufpos = 0;
 
     anetNonBlock(NULL,fd);
@@ -87,7 +83,7 @@ robj *dupLastObjectIfNeeded(list *reply) {
 }
 
 int _addReplyToBuffer(redisClient *c, char *s, size_t len) {
-    size_t available = c->buflen-c->bufpos;
+    size_t available = sizeof(c->buf)-c->bufpos;
 
     /* If there already are entries in the reply list, we cannot
      * add anything more to the static buffer. */

diff --git a/src/redis.h b/src/redis.h
index 1ef5628872b771d0f79e0321658eb110b6c0b806..38727ae200d48493aaf2cac7420e3485eab18ed1 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -313,8 +313,7 @@ typedef struct redisClient {
 
     /* Response buffer */
     int bufpos;
-    int buflen;
-    char buf[];
+    char buf[REDIS_REPLY_CHUNK_BYTES];
 } redisClient;
 
 struct saveparam {