More work on non-blocking VM. Should work in a few days

[redis.git] / benchmark.c

diff --git a/benchmark.c b/benchmark.c
index bf8e2834d9422224f578b231f4f6fa42b40883b5..2984efe4139c9fc6740a3f7cdfbfd1ab4310d23b 100644 (file)
--- a/benchmark.c
+++ b/benchmark.c
@@ -59,6 +59,7 @@
 #define REDIS_NOTUSED(V) ((void) V)
 
 static struct config {
 #define REDIS_NOTUSED(V) ((void) V)
 
 static struct config {

+    int debug;

     int numclients;
     int requests;
     int liveclients;
     int numclients;
     int requests;
     int liveclients;


@@ -77,6 +78,7 @@ static struct config {
     list *clients;
     int quiet;
     int loop;
     list *clients;
     int quiet;
     int loop;

+    int idlemode;

 } config;
 
 typedef struct _client {
 } config;
 
 typedef struct _client {


@@ -86,6 +88,7 @@ typedef struct _client {
     sds ibuf;
     int mbulk;          /* Number of elements in an mbulk reply */
     int readlen;        /* readlen == -1 means read a single line */
     sds ibuf;
     int mbulk;          /* Number of elements in an mbulk reply */
     int readlen;        /* readlen == -1 means read a single line */

+    int totreceived;

     unsigned int written;        /* bytes of 'obuf' already written */
     int replytype;
     long long start;    /* start time in milliseconds */
     unsigned int written;        /* bytes of 'obuf' already written */
     int replytype;
     long long start;    /* start time in milliseconds */


@@ -134,12 +137,14 @@ static void freeAllClients(void) {
 static void resetClient(client c) {
     aeDeleteFileEvent(config.el,c->fd,AE_WRITABLE);
     aeDeleteFileEvent(config.el,c->fd,AE_READABLE);
 static void resetClient(client c) {
     aeDeleteFileEvent(config.el,c->fd,AE_WRITABLE);
     aeDeleteFileEvent(config.el,c->fd,AE_READABLE);

-    aeCreateFileEvent(config.el,c->fd, AE_WRITABLE,writeHandler,c,NULL);
+    aeCreateFileEvent(config.el,c->fd, AE_WRITABLE,writeHandler,c);

     sdsfree(c->ibuf);
     c->ibuf = sdsempty();
     sdsfree(c->ibuf);
     c->ibuf = sdsempty();

-    c->readlen = (c->replytype == REPLY_BULK) ? -1 : 0;
+    c->readlen = (c->replytype == REPLY_BULK ||
+                  c->replytype == REPLY_MBULK) ? -1 : 0;

     c->mbulk = -1;
     c->written = 0;
     c->mbulk = -1;
     c->written = 0;

+    c->totreceived = 0;

     c->state = CLIENT_SENDQUERY;
     c->start = mstime();
     createMissingClients(c);
     c->state = CLIENT_SENDQUERY;
     c->start = mstime();
     createMissingClients(c);


@@ -173,12 +178,18 @@ static void prepareClientForReply(client c, int type) {
 }
 
 static void clientDone(client c) {
 }
 
 static void clientDone(client c) {

+    static int last_tot_received = 1;
+

     long long latency;
     config.donerequests ++;
     latency = mstime() - c->start;
     if (latency > MAX_LATENCY) latency = MAX_LATENCY;
     config.latency[latency]++;
 
     long long latency;
     config.donerequests ++;
     latency = mstime() - c->start;
     if (latency > MAX_LATENCY) latency = MAX_LATENCY;
     config.latency[latency]++;
 

+    if (config.debug && last_tot_received != c->totreceived) {
+        printf("Tot bytes received: %d\n", c->totreceived);
+        last_tot_received = c->totreceived;
+    }

     if (config.donerequests == config.requests) {
         freeClient(c);
         aeStop(config.el);
     if (config.donerequests == config.requests) {
         freeClient(c);
         aeStop(config.el);


@@ -215,6 +226,7 @@ static void readHandler(aeEventLoop *el, int fd, void *privdata, int mask)
         freeClient(c);
         return;
     }
         freeClient(c);
         return;
     }

+    c->totreceived += nread;

     c->ibuf = sdscatlen(c->ibuf,buf,nread);
 
 processdata:
     c->ibuf = sdscatlen(c->ibuf,buf,nread);
 
 processdata:


@@ -238,6 +250,7 @@ processdata:
                 *p = '\0';
                 *(p-1) = '\0';
                 c->readlen = atoi(c->ibuf+1)+2;
                 *p = '\0';
                 *(p-1) = '\0';
                 c->readlen = atoi(c->ibuf+1)+2;

+                // printf("BULK ATOI: %s\n", c->ibuf+1);

                 /* Handle null bulk reply "$-1" */
                 if (c->readlen-2 == -1) {
                     clientDone(c);
                 /* Handle null bulk reply "$-1" */
                 if (c->readlen-2 == -1) {
                     clientDone(c);


@@ -258,6 +271,7 @@ processdata:
                     clientDone(c);
                     return;
                 }
                     clientDone(c);
                     return;
                 }

+                // printf("%p) %d elements list\n", c, c->mbulk);

                 /* Leave all the rest in the input buffer */
                 c->ibuf = sdsrange(c->ibuf,(p-c->ibuf)+1,-1);
                 goto processdata;
                 /* Leave all the rest in the input buffer */
                 c->ibuf = sdsrange(c->ibuf,(p-c->ibuf)+1,-1);
                 goto processdata;


@@ -273,9 +287,14 @@ processdata:
          (c->replytype == REPLY_BULK)) && c->readlen != -1 &&
           (unsigned)c->readlen <= sdslen(c->ibuf))
     {
          (c->replytype == REPLY_BULK)) && c->readlen != -1 &&
           (unsigned)c->readlen <= sdslen(c->ibuf))
     {

+        // printf("BULKSTATUS mbulk:%d readlen:%d sdslen:%d\n",
+        //    c->mbulk,c->readlen,sdslen(c->ibuf));

         if (c->replytype == REPLY_BULK) {
             clientDone(c);
         } else if (c->replytype == REPLY_MBULK) {
         if (c->replytype == REPLY_BULK) {
             clientDone(c);
         } else if (c->replytype == REPLY_MBULK) {

+            // printf("%p) %d (%d)) ",c, c->mbulk, c->readlen);
+            // fwrite(c->ibuf,c->readlen,1,stdout);
+            // printf("\n");

             if (--c->mbulk == 0) {
                 clientDone(c);
             } else {
             if (--c->mbulk == 0) {
                 clientDone(c);
             } else {


@@ -303,14 +322,15 @@ static void writeHandler(aeEventLoop *el, int fd, void *privdata, int mask)
         int len = sdslen(c->obuf) - c->written;
         int nwritten = write(c->fd, ptr, len);
         if (nwritten == -1) {
         int len = sdslen(c->obuf) - c->written;
         int nwritten = write(c->fd, ptr, len);
         if (nwritten == -1) {

-            fprintf(stderr, "Writing to socket: %s\n", strerror(errno));
+            if (errno != EPIPE)
+                fprintf(stderr, "Writing to socket: %s\n", strerror(errno));

             freeClient(c);
             return;
         }
         c->written += nwritten;
         if (sdslen(c->obuf) == c->written) {
             aeDeleteFileEvent(config.el,c->fd,AE_WRITABLE);
             freeClient(c);
             return;
         }
         c->written += nwritten;
         if (sdslen(c->obuf) == c->written) {
             aeDeleteFileEvent(config.el,c->fd,AE_WRITABLE);

-            aeCreateFileEvent(config.el,c->fd,AE_READABLE,readHandler,c,NULL);
+            aeCreateFileEvent(config.el,c->fd,AE_READABLE,readHandler,c);

             c->state = CLIENT_READREPLY;
         }
     }
             c->state = CLIENT_READREPLY;
         }
     }


@@ -332,8 +352,9 @@ static client createClient(void) {
     c->mbulk = -1;
     c->readlen = 0;
     c->written = 0;
     c->mbulk = -1;
     c->readlen = 0;
     c->written = 0;

+    c->totreceived = 0;

     c->state = CLIENT_CONNECTING;
     c->state = CLIENT_CONNECTING;

-    aeCreateFileEvent(config.el, c->fd, AE_WRITABLE, writeHandler, c, NULL);
+    aeCreateFileEvent(config.el, c->fd, AE_WRITABLE, writeHandler, c);

     config.liveclients++;
     listAddNodeTail(config.clients,c);
     return c;
     config.liveclients++;
     listAddNodeTail(config.clients,c);
     return c;


@@ -346,9 +367,7 @@ static void createMissingClients(client c) {
         sdsfree(new->obuf);
         new->obuf = sdsdup(c->obuf);
         if (config.randomkeys) randomizeClientKey(c);
         sdsfree(new->obuf);
         new->obuf = sdsdup(c->obuf);
         if (config.randomkeys) randomizeClientKey(c);

-        new->replytype = c->replytype;
-        if (c->replytype == REPLY_BULK)
-            new->readlen = -1;
+        prepareClientForReply(new,c->replytype);

     }
 }
 
     }
 }
 


@@ -432,6 +451,10 @@ void parseOptions(int argc, char **argv) {
             config.quiet = 1;
         } else if (!strcmp(argv[i],"-l")) {
             config.loop = 1;
             config.quiet = 1;
         } else if (!strcmp(argv[i],"-l")) {
             config.loop = 1;

+        } else if (!strcmp(argv[i],"-D")) {
+            config.debug = 1;
+        } else if (!strcmp(argv[i],"-I")) {
+            config.idlemode = 1;

         } else {
             printf("Wrong option '%s' or option argument missing\n\n",argv[i]);
             printf("Usage: redis-benchmark [-h <host>] [-p <port>] [-c <clients>] [-n <requests]> [-k <boolean>]\n\n");
         } else {
             printf("Wrong option '%s' or option argument missing\n\n",argv[i]);
             printf("Usage: redis-benchmark [-h <host>] [-p <port>] [-c <clients>] [-n <requests]> [-k <boolean>]\n\n");


@@ -450,6 +473,8 @@ void parseOptions(int argc, char **argv) {
             printf("  range will be allowed.\n");
             printf(" -q                 Quiet. Just show query/sec values\n");
             printf(" -l                 Loop. Run the tests forever\n");
             printf("  range will be allowed.\n");
             printf(" -q                 Quiet. Just show query/sec values\n");
             printf(" -l                 Loop. Run the tests forever\n");

+            printf(" -I                 Idle mode. Just open N idle connections and wait.\n");
+            printf(" -D                 Debug mode. more verbose.\n");

             exit(1);
         }
     }
             exit(1);
         }
     }


@@ -461,6 +486,7 @@ int main(int argc, char **argv) {
     signal(SIGHUP, SIG_IGN);
     signal(SIGPIPE, SIG_IGN);
 
     signal(SIGHUP, SIG_IGN);
     signal(SIGPIPE, SIG_IGN);
 

+    config.debug = 0;

     config.numclients = 50;
     config.requests = 10000;
     config.liveclients = 0;
     config.numclients = 50;
     config.requests = 10000;
     config.liveclients = 0;


@@ -472,6 +498,7 @@ int main(int argc, char **argv) {
     config.randomkeys_keyspacelen = 0;
     config.quiet = 0;
     config.loop = 0;
     config.randomkeys_keyspacelen = 0;
     config.quiet = 0;
     config.loop = 0;

+    config.idlemode = 0;

     config.latency = NULL;
     config.clients = listCreate();
     config.latency = zmalloc(sizeof(int)*(MAX_LATENCY+1));
     config.latency = NULL;
     config.clients = listCreate();
     config.latency = zmalloc(sizeof(int)*(MAX_LATENCY+1));


@@ -485,6 +512,18 @@ int main(int argc, char **argv) {
         printf("WARNING: keepalive disabled, you probably need 'echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse' for Linux and 'sudo sysctl -w net.inet.tcp.msl=1000' for Mac OS X in order to use a lot of clients/requests\n");
     }
 
         printf("WARNING: keepalive disabled, you probably need 'echo 1 > /proc/sys/net/ipv4/tcp_tw_reuse' for Linux and 'sudo sysctl -w net.inet.tcp.msl=1000' for Mac OS X in order to use a lot of clients/requests\n");
     }
 

+    if (config.idlemode) {
+        printf("Creating %d idle connections and waiting forever (Ctrl+C when done)\n", config.numclients);
+        prepareForBenchmark();
+        c = createClient();
+        if (!c) exit(1);
+        c->obuf = sdsempty();
+        prepareClientForReply(c,REPLY_RETCODE); /* will never receive it */
+        createMissingClients(c);
+        aeMain(config.el);
+        /* and will wait for every */
+    }
+

     do {
         prepareForBenchmark();
         c = createClient();
     do {
         prepareForBenchmark();
         c = createClient();


@@ -574,6 +613,24 @@ int main(int argc, char **argv) {
         aeMain(config.el);
         endBenchmark("LRANGE (first 300 elements)");
 
         aeMain(config.el);
         endBenchmark("LRANGE (first 300 elements)");
 

+        prepareForBenchmark();
+        c = createClient();
+        if (!c) exit(1);
+        c->obuf = sdscat(c->obuf,"LRANGE mylist 0 449\r\n");
+        prepareClientForReply(c,REPLY_MBULK);
+        createMissingClients(c);
+        aeMain(config.el);
+        endBenchmark("LRANGE (first 450 elements)");
+
+        prepareForBenchmark();
+        c = createClient();
+        if (!c) exit(1);
+        c->obuf = sdscat(c->obuf,"LRANGE mylist 0 599\r\n");
+        prepareClientForReply(c,REPLY_MBULK);
+        createMissingClients(c);
+        aeMain(config.el);
+        endBenchmark("LRANGE (first 600 elements)");
+

         printf("\n");
     } while(config.loop);
 
         printf("\n");
     } while(config.loop);