more experiments with long replies, glue output buffer, and writev.

diff --git a/benchmark.c b/benchmark.c
index a933eba9c48ca4c2ccb0628548944d40f01d6b74..6b4fb2ff419e83531a5fd377c4dd921b81763bd1 100644 (file)
--- a/benchmark.c
+++ b/benchmark.c
@@ -486,6 +486,7 @@ int main(int argc, char **argv) {
     }
 
     do {
     }
 
     do {

+#if 0

         prepareForBenchmark();
         c = createClient();
         if (!c) exit(1);
         prepareForBenchmark();
         c = createClient();
         if (!c) exit(1);


@@ -547,6 +548,7 @@ int main(int argc, char **argv) {
         aeMain(config.el);
         endBenchmark("PING");
 
         aeMain(config.el);
         endBenchmark("PING");
 

+#endif

         prepareForBenchmark();
         c = createClient();
         if (!c) exit(1);
         prepareForBenchmark();
         c = createClient();
         if (!c) exit(1);


@@ -556,6 +558,7 @@ int main(int argc, char **argv) {
         aeMain(config.el);
         endBenchmark("LPUSH (again, in order to bench LRANGE)");
 
         aeMain(config.el);
         endBenchmark("LPUSH (again, in order to bench LRANGE)");
 

+#if 0

         prepareForBenchmark();
         c = createClient();
         if (!c) exit(1);
         prepareForBenchmark();
         c = createClient();
         if (!c) exit(1);


@@ -582,6 +585,7 @@ int main(int argc, char **argv) {
         createMissingClients(c);
         aeMain(config.el);
         endBenchmark("LRANGE (first 450 elements)");
         createMissingClients(c);
         aeMain(config.el);
         endBenchmark("LRANGE (first 450 elements)");

+#endif

 
         prepareForBenchmark();
         c = createClient();
 
         prepareForBenchmark();
         c = createClient();

diff --git a/redis.c b/redis.c
index 52143e56735e271dd0a909239530a2192ea3284f..daf2c9bcee6eef51bbecc6c2a48a92ab543baf14 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -1351,33 +1351,29 @@ static void freeClient(redisClient *c) {
 
 #define GLUEREPLY_UP_TO (1024)
 static void glueReplyBuffersIfNeeded(redisClient *c) {
 
 #define GLUEREPLY_UP_TO (1024)
 static void glueReplyBuffersIfNeeded(redisClient *c) {

-    int totlen = 0;
+    int copylen = 0;
+    char buf[GLUEREPLY_UP_TO];

     listNode *ln;
     robj *o;
 
     listRewind(c->reply);
     while((ln = listYield(c->reply))) {
     listNode *ln;
     robj *o;
 
     listRewind(c->reply);
     while((ln = listYield(c->reply))) {

+        int objlen;
+

         o = ln->value;
         o = ln->value;

-        totlen += sdslen(o->ptr);
-        /* This optimization makes more sense if we don't have to copy
-         * too much data */
-        if (totlen > GLUEREPLY_UP_TO) return;
-    }
-    if (totlen > 0) {
-        char buf[GLUEREPLY_UP_TO];
-        int copylen = 0;
-
-        listRewind(c->reply);
-        while((ln = listYield(c->reply))) {
-            o = ln->value;
-            memcpy(buf+copylen,o->ptr,sdslen(o->ptr));
-            copylen += sdslen(o->ptr);
+        objlen = sdslen(o->ptr);
+        if (copylen + objlen <= GLUEREPLY_UP_TO) {
+            memcpy(buf+copylen,o->ptr,objlen);
+            copylen += objlen;

             listDelNode(c->reply,ln);
             listDelNode(c->reply,ln);

+        } else {
+            if (copylen == 0) return;
+            break;

         }
         }

-        /* Now the output buffer is empty, add the new single element */
-        o = createObject(REDIS_STRING,sdsnewlen(buf,totlen));
-        listAddNodeTail(c->reply,o);

     }
     }

+    /* Now the output buffer is empty, add the new single element */
+    o = createObject(REDIS_STRING,sdsnewlen(buf,copylen));
+    listAddNodeHead(c->reply,o);

 }
 
 static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {
 }
 
 static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask) {


@@ -1387,8 +1383,6 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask)
     REDIS_NOTUSED(el);
     REDIS_NOTUSED(mask);
 
     REDIS_NOTUSED(el);
     REDIS_NOTUSED(mask);
 

-    if (server.glueoutputbuf && listLength(c->reply) > 1)
-        glueReplyBuffersIfNeeded(c);

 
     /* Use writev() if we have enough buffers to send */
 #if 0
 
     /* Use writev() if we have enough buffers to send */
 #if 0


@@ -1401,6 +1395,9 @@ static void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask)
 #endif
 
     while(listLength(c->reply)) {
 #endif
 
     while(listLength(c->reply)) {

+        if (server.glueoutputbuf && listLength(c->reply) > 1)
+            glueReplyBuffersIfNeeded(c);
+

         o = listNodeValue(listFirst(c->reply));
         objlen = sdslen(o->ptr);
 
         o = listNodeValue(listFirst(c->reply));
         objlen = sdslen(o->ptr);
 

diff --git a/test-redis.tcl b/test-redis.tcl
index 1ca5e21acba831c8b4ff96fb9714ade8543ac915..400b0db5e464302f4d10ca73385d7bd6e06d5851 100644 (file)
--- a/test-redis.tcl
+++ b/test-redis.tcl
@@ -912,6 +912,10 @@ proc main {server port} {
         lappend aux [$r dbsize]
     } {0 0}
 
         lappend aux [$r dbsize]
     } {0 0}
 

+    test {Perform a final SAVE to leave a clean DB on disk} {
+        $r save
+    } {OK}
+

     puts "\n[expr $::passed+$::failed] tests, $::passed passed, $::failed failed"
     if {$::failed > 0} {
         puts "\n*** WARNING!!! $::failed FAILED TESTS ***\n"
     puts "\n[expr $::passed+$::failed] tests, $::passed passed, $::failed failed"
     if {$::failed > 0} {
         puts "\n*** WARNING!!! $::failed FAILED TESTS ***\n"