X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/f474a5bd4e80157235dac13326edaa99181fb120..419e1cca74102440d5ce174fbbf36d81a9b8956a:/src/redis-benchmark.c diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c index df3b85fd..618d9c03 100644 --- a/src/redis-benchmark.c +++ b/src/redis-benchmark.c @@ -45,10 +45,6 @@ #include "adlist.h" #include "zmalloc.h" -#define CLIENT_CONNECTING 0 -#define CLIENT_SENDQUERY 1 -#define CLIENT_READREPLY 2 - #define REDIS_NOTUSED(V) ((void) V) static struct config { @@ -78,11 +74,10 @@ static struct config { typedef struct _client { redisContext *context; - int state; sds obuf; - char *randptr; + char *randptr[10]; /* needed for MSET against 10 keys */ + size_t randlen; unsigned int written; /* bytes of 'obuf' already written */ - int replytype; long long start; /* start time of a request */ long long latency; /* request latency */ } *client; @@ -140,35 +135,17 @@ static void resetClient(client c) { aeDeleteFileEvent(config.el,c->context->fd,AE_READABLE); aeCreateFileEvent(config.el,c->context->fd,AE_WRITABLE,writeHandler,c); c->written = 0; - c->state = CLIENT_SENDQUERY; - c->start = ustime(); - c->latency = -1; } static void randomizeClientKey(client c) { - char *p, *newline; char buf[32]; - long r; - - if (c->randptr == NULL) return; + size_t i, r; - /* Check if we have to randomize (only once per connection) */ - if (c->randptr == (void*)-1) { - p = strstr(c->obuf,":rand:"); - if (!p) { - c->randptr = NULL; - return; - } else { - newline = strstr(p,"\r\n"); - assert(newline-(p+6) == 12); /* 12 chars for randomness */ - c->randptr = p+6; - } + for (i = 0; i < c->randlen; i++) { + r = random() % config.randomkeys_keyspacelen; + snprintf(buf,sizeof(buf),"%012zu",r); + memcpy(c->randptr[i],buf,12); } - - /* Set random number in output buffer */ - r = random() % config.randomkeys_keyspacelen; - snprintf(buf,sizeof(buf),"%012ld",r); - memcpy(c->randptr,buf,12); } static void clientDone(client c) { @@ -179,7 +156,6 @@ static void clientDone(client c) { } if (config.keepalive) { resetClient(c); - if (config.randomkeys) randomizeClientKey(c); } else { config.liveclients--; createMissingClients(c); @@ -227,11 +203,13 @@ static void writeHandler(aeEventLoop *el, int fd, void *privdata, int mask) { REDIS_NOTUSED(fd); REDIS_NOTUSED(mask); - if (c->state == CLIENT_CONNECTING) { - c->state = CLIENT_SENDQUERY; + /* When nothing was written yet, randomize keys and set start time. */ + if (c->written == 0) { + if (config.randomkeys) randomizeClientKey(c); c->start = ustime(); c->latency = -1; } + if (sdslen(c->obuf) > c->written) { void *ptr = c->obuf+c->written; int nwritten = write(c->context->fd,ptr,sdslen(c->obuf)-c->written); @@ -245,12 +223,11 @@ static void writeHandler(aeEventLoop *el, int fd, void *privdata, int mask) { if (sdslen(c->obuf) == c->written) { aeDeleteFileEvent(config.el,c->context->fd,AE_WRITABLE); aeCreateFileEvent(config.el,c->context->fd,AE_READABLE,readHandler,c); - c->state = CLIENT_READREPLY; } } } -static client createClient(int replytype) { +static client createClient(char *cmd, int len) { client c = zmalloc(sizeof(struct _client)); if (config.hostsocket == NULL) { c->context = redisConnectNonBlock(config.hostip,config.hostport); @@ -265,11 +242,22 @@ static client createClient(int replytype) { fprintf(stderr,"%s: %s\n",config.hostsocket,c->context->errstr); exit(1); } - c->replytype = replytype; - c->state = CLIENT_CONNECTING; - c->obuf = NULL; - c->randptr = (void*)-1; + c->obuf = sdsnewlen(cmd,len); + c->randlen = 0; c->written = 0; + + /* Find substrings in the output buffer that need to be randomized. */ + if (config.randomkeys) { + char *p = c->obuf, *newline; + while ((p = strstr(p,":rand:")) != NULL) { + newline = strstr(p,"\r\n"); + assert(newline-(p+6) == 12); /* 12 chars for randomness */ + assert(c->randlen < (signed)(sizeof(c->randptr)/sizeof(char*))); + c->randptr[c->randlen++] = p+6; + p = newline+2; + } + } + redisSetReplyObjectFunctions(c->context,NULL); aeCreateFileEvent(config.el,c->context->fd,AE_WRITABLE,writeHandler,c); listAddNodeTail(config.clients,c); @@ -281,9 +269,7 @@ static void createMissingClients(client c) { int n = 0; while(config.liveclients < config.numclients) { - client new = createClient(c->replytype); - new->obuf = sdsdup(c->obuf); - if (config.randomkeys) randomizeClientKey(c); + createClient(c->obuf,sdslen(c->obuf)); /* Listen backlog is quite limited on most systems */ if (++n > 64) { @@ -291,9 +277,6 @@ static void createMissingClients(client c) { n = 0; } } - - /* Start the timer once the connection are established */ - config.start = mstime(); } static int compareLatency(const void *a, const void *b) { @@ -328,14 +311,19 @@ static void showLatencyReport(void) { } } -static void prepareForBenchmark(char *title) { +static void benchmark(char *title, char *cmd, int len) { + client c; + config.title = title; - config.start = mstime(); config.donerequests = 0; -} -static void endBenchmark(void) { + c = createClient(cmd,len); + createMissingClients(c); + + config.start = mstime(); + aeMain(config.el); config.totlatency = mstime()-config.start; + showLatencyReport(); freeAllClients(); } @@ -457,9 +445,7 @@ int main(int argc, char **argv) { if (config.idlemode) { printf("Creating %d idle connections and waiting forever (Ctrl+C when done)\n", config.numclients); - prepareForBenchmark("IDLE"); - c = createClient(0); /* will never receive a reply */ - c->obuf = sdsempty(); + c = createClient("",0); /* will never receive a reply */ createMissingClients(c); aeMain(config.el); /* and will wait for every */ @@ -473,144 +459,69 @@ int main(int argc, char **argv) { memset(data,'x',config.datasize); data[config.datasize] = '\0'; - prepareForBenchmark("PING (inline)"); - c = createClient(REDIS_REPLY_STATUS); - c->obuf = sdscat(sdsempty(),"PING\r\n"); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + benchmark("PING (inline)","PING\r\n",6); - prepareForBenchmark("PING"); - c = createClient(REDIS_REPLY_STATUS); len = redisFormatCommand(&cmd,"PING"); - c->obuf = sdsnewlen(cmd,len); + benchmark("PING",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - - prepareForBenchmark("MSET (10 keys)"); - c = createClient(REDIS_REPLY_ARRAY); - { - const char *argv[11]; - argv[0] = "MSET"; - for (i = 1; i < 11; i++) - argv[i] = data; - len = redisFormatCommandArgv(&cmd,11,argv,NULL); - c->obuf = sdsnewlen(cmd,len); - free(cmd); + + const char *argv[21]; + argv[0] = "MSET"; + for (i = 1; i < 21; i += 2) { + argv[i] = "foo:rand:000000000000"; + argv[i+1] = data; } - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + len = redisFormatCommandArgv(&cmd,21,argv,NULL); + benchmark("MSET (10 keys)",cmd,len); + free(cmd); - prepareForBenchmark("SET"); - c = createClient(REDIS_REPLY_STATUS); len = redisFormatCommand(&cmd,"SET foo:rand:000000000000 %s",data); - c->obuf = sdsnewlen(cmd,len); + benchmark("SET",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("GET"); - c = createClient(REDIS_REPLY_STRING); len = redisFormatCommand(&cmd,"GET foo:rand:000000000000"); - c->obuf = sdsnewlen(cmd,len); + benchmark("GET",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("INCR"); - c = createClient(REDIS_REPLY_INTEGER); len = redisFormatCommand(&cmd,"INCR counter:rand:000000000000"); - c->obuf = sdsnewlen(cmd,len); + benchmark("INCR",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("LPUSH"); - c = createClient(REDIS_REPLY_INTEGER); len = redisFormatCommand(&cmd,"LPUSH mylist %s",data); - c->obuf = sdsnewlen(cmd,len); + benchmark("LPUSH",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("LPOP"); - c = createClient(REDIS_REPLY_STRING); len = redisFormatCommand(&cmd,"LPOP mylist"); - c->obuf = sdsnewlen(cmd,len); + benchmark("LPOP",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("SADD"); - c = createClient(REDIS_REPLY_STATUS); len = redisFormatCommand(&cmd,"SADD myset counter:rand:000000000000"); - c->obuf = sdsnewlen(cmd,len); + benchmark("SADD",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("SPOP"); - c = createClient(REDIS_REPLY_STRING); len = redisFormatCommand(&cmd,"SPOP myset"); - c->obuf = sdsnewlen(cmd,len); + benchmark("SPOP",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("LPUSH (again, in order to bench LRANGE)"); - c = createClient(REDIS_REPLY_STATUS); len = redisFormatCommand(&cmd,"LPUSH mylist %s",data); - c->obuf = sdsnewlen(cmd,len); + benchmark("LPUSH (again, in order to bench LRANGE)",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("LRANGE (first 100 elements)"); - c = createClient(REDIS_REPLY_ARRAY); len = redisFormatCommand(&cmd,"LRANGE mylist 0 99"); - c->obuf = sdsnewlen(cmd,len); + benchmark("LRANGE (first 100 elements)",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("LRANGE (first 300 elements)"); - c = createClient(REDIS_REPLY_ARRAY); len = redisFormatCommand(&cmd,"LRANGE mylist 0 299"); - c->obuf = sdsnewlen(cmd,len); + benchmark("LRANGE (first 300 elements)",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("LRANGE (first 450 elements)"); - c = createClient(REDIS_REPLY_ARRAY); len = redisFormatCommand(&cmd,"LRANGE mylist 0 449"); - c->obuf = sdsnewlen(cmd,len); + benchmark("LRANGE (first 450 elements)",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("LRANGE (first 600 elements)"); - c = createClient(REDIS_REPLY_ARRAY); len = redisFormatCommand(&cmd,"LRANGE mylist 0 599"); - c->obuf = sdsnewlen(cmd,len); + benchmark("LRANGE (first 600 elements)",cmd,len); free(cmd); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); printf("\n"); } while(config.loop);