X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/89f9f83769a2ad0b4aeb8907b82b453ace6ebe9d..65fd32ab0a7ff1d3d052e3b70dcceac6719de58c:/src/redis-benchmark.c diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c index 297ecc6c..19eb4915 100644 --- a/src/redis-benchmark.c +++ b/src/redis-benchmark.c @@ -40,59 +40,50 @@ #include #include "ae.h" -#include "anet.h" +#include "hiredis.h" #include "sds.h" #include "adlist.h" #include "zmalloc.h" -#define REPLY_INT 0 -#define REPLY_RETCODE 1 -#define REPLY_BULK 2 -#define REPLY_MBULK 3 - -#define CLIENT_CONNECTING 0 -#define CLIENT_SENDQUERY 1 -#define CLIENT_READREPLY 2 - -#define MAX_LATENCY 5000 - #define REDIS_NOTUSED(V) ((void) V) static struct config { - int debug; + aeEventLoop *el; + const char *hostip; + int hostport; + const char *hostsocket; int numclients; - int requests; int liveclients; - int donerequests; + int requests; + int requests_issued; + int requests_finished; int keysize; int datasize; int randomkeys; int randomkeys_keyspacelen; - aeEventLoop *el; - char *hostip; - int hostport; int keepalive; + int pipeline; long long start; long long totlatency; - int *latency; - char *title; + long long *latency; + const char *title; list *clients; int quiet; + int csv; int loop; int idlemode; + char *tests; } config; typedef struct _client { - int state; - int fd; + redisContext *context; sds obuf; - 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 */ + char *randptr[32]; /* needed for MSET against 10 keys */ + size_t randlen; + unsigned int written; /* bytes of 'obuf' already written */ + long long start; /* start time of a request */ + long long latency; /* request latency */ + int pending; /* Number of pending requests (sent but no reply received) */ } *client; /* Prototypes */ @@ -100,6 +91,16 @@ static void writeHandler(aeEventLoop *el, int fd, void *privdata, int mask); static void createMissingClients(client c); /* Implementation */ +static long long ustime(void) { + struct timeval tv; + long long ust; + + gettimeofday(&tv, NULL); + ust = ((long)tv.tv_sec)*1000000; + ust += tv.tv_usec; + return ust; +} + static long long mstime(void) { struct timeval tv; long long mst; @@ -112,12 +113,10 @@ static long long mstime(void) { static void freeClient(client c) { listNode *ln; - - aeDeleteFileEvent(config.el,c->fd,AE_WRITABLE); - aeDeleteFileEvent(config.el,c->fd,AE_READABLE); - sdsfree(c->ibuf); + aeDeleteFileEvent(config.el,c->context->fd,AE_WRITABLE); + aeDeleteFileEvent(config.el,c->context->fd,AE_READABLE); + redisFree(c->context); sdsfree(c->obuf); - close(c->fd); zfree(c); config.liveclients--; ln = listSearchKey(config.clients,c); @@ -136,69 +135,32 @@ static void freeAllClients(void) { } 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); - sdsfree(c->ibuf); - c->ibuf = sdsempty(); - c->readlen = (c->replytype == REPLY_BULK || - c->replytype == REPLY_MBULK) ? -1 : 0; - c->mbulk = -1; + aeDeleteFileEvent(config.el,c->context->fd,AE_WRITABLE); + aeDeleteFileEvent(config.el,c->context->fd,AE_READABLE); + aeCreateFileEvent(config.el,c->context->fd,AE_WRITABLE,writeHandler,c); c->written = 0; - c->totreceived = 0; - c->state = CLIENT_SENDQUERY; - c->start = mstime(); - createMissingClients(c); + c->pending = config.pipeline; } static void randomizeClientKey(client c) { - char *p; char buf[32]; - long r; - - p = strstr(c->obuf, "_rand"); - if (!p) return; - p += 5; - r = random() % config.randomkeys_keyspacelen; - sprintf(buf,"%ld",r); - memcpy(p,buf,strlen(buf)); -} + size_t i, r; -static void prepareClientForReply(client c, int type) { - if (type == REPLY_BULK) { - c->replytype = REPLY_BULK; - c->readlen = -1; - } else if (type == REPLY_MBULK) { - c->replytype = REPLY_MBULK; - c->readlen = -1; - c->mbulk = -1; - } else { - c->replytype = type; - c->readlen = 0; + for (i = 0; i < c->randlen; i++) { + r = random() % config.randomkeys_keyspacelen; + snprintf(buf,sizeof(buf),"%012zu",r); + memcpy(c->randptr[i],buf,12); } } 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]++; - - 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) { + if (config.requests_finished == config.requests) { freeClient(c); aeStop(config.el); return; } if (config.keepalive) { resetClient(c); - if (config.randomkeys) randomizeClientKey(c); } else { config.liveclients--; createMissingClients(c); @@ -207,139 +169,69 @@ static void clientDone(client c) { } } -/* Read a length from the buffer pointed to by *p, store the length in *len, - * and return the number of bytes that the cursor advanced. */ -static int readLen(char *p, int *len) { - char *tail = strstr(p,"\r\n"); - if (tail == NULL) - return 0; - *tail = '\0'; - *len = atoi(p+1); - return tail+2-p; -} - -static void readHandler(aeEventLoop *el, int fd, void *privdata, int mask) -{ - char buf[1024], *p; - int nread, pos=0, len=0; +static void readHandler(aeEventLoop *el, int fd, void *privdata, int mask) { client c = privdata; + void *reply = NULL; REDIS_NOTUSED(el); REDIS_NOTUSED(fd); REDIS_NOTUSED(mask); - nread = read(c->fd,buf,sizeof(buf)); - if (nread == -1) { - fprintf(stderr, "Reading from socket: %s\n", strerror(errno)); - freeClient(c); - return; - } - if (nread == 0) { - fprintf(stderr, "EOF from client\n"); - freeClient(c); - return; - } - c->totreceived += nread; - c->ibuf = sdscatlen(c->ibuf,buf,nread); - len = sdslen(c->ibuf); - - if (c->replytype == REPLY_INT || - c->replytype == REPLY_RETCODE) - { - /* Check if the first line is complete. This is everything we need - * when waiting for an integer or status code reply.*/ - if ((p = strstr(c->ibuf,"\r\n")) != NULL) - goto done; - } else if (c->replytype == REPLY_BULK) { - int advance = 0; - if (c->readlen < 0) { - advance = readLen(c->ibuf+pos,&c->readlen); - if (advance) { - pos += advance; - if (c->readlen == -1) { - goto done; - } else { - /* include the trailing \r\n */ - c->readlen += 2; - } - } else { - goto skip; - } - } - - int canconsume; - if (c->readlen > 0) { - canconsume = c->readlen > (len-pos) ? (len-pos) : c->readlen; - c->readlen -= canconsume; - pos += canconsume; - } + /* Calculate latency only for the first read event. This means that the + * server already sent the reply and we need to parse it. Parsing overhead + * is not part of the latency, so calculate it only once, here. */ + if (c->latency < 0) c->latency = ustime()-(c->start); - if (c->readlen == 0) - goto done; - } else if (c->replytype == REPLY_MBULK) { - int advance = 0; - if (c->mbulk == -1) { - advance = readLen(c->ibuf+pos,&c->mbulk); - if (advance) { - pos += advance; - if (c->mbulk == -1) - goto done; - } else { - goto skip; + if (redisBufferRead(c->context) != REDIS_OK) { + fprintf(stderr,"Error: %s\n",c->context->errstr); + exit(1); + } else { + while(c->pending) { + if (redisGetReply(c->context,&reply) != REDIS_OK) { + fprintf(stderr,"Error: %s\n",c->context->errstr); + exit(1); } - } + if (reply != NULL) { + if (reply == (void*)REDIS_REPLY_ERROR) { + fprintf(stderr,"Unexpected error reply, exiting...\n"); + exit(1); + } + + freeReplyObject(reply); - int canconsume; - while(c->mbulk > 0 && pos < len) { - if (c->readlen > 0) { - canconsume = c->readlen > (len-pos) ? (len-pos) : c->readlen; - c->readlen -= canconsume; - pos += canconsume; - if (c->readlen == 0) - c->mbulk--; + if (config.requests_finished < config.requests) + config.latency[config.requests_finished++] = c->latency; + c->pending--; + if (c->pending == 0) clientDone(c); } else { - advance = readLen(c->ibuf+pos,&c->readlen); - if (advance) { - pos += advance; - if (c->readlen == -1) { - c->mbulk--; - continue; - } else { - /* include the trailing \r\n */ - c->readlen += 2; - } - } else { - goto skip; - } + break; } } - - if (c->mbulk == 0) - goto done; } - -skip: - c->ibuf = sdsrange(c->ibuf,pos,-1); - return; -done: - clientDone(c); - return; } -static void writeHandler(aeEventLoop *el, int fd, void *privdata, int mask) -{ +static void writeHandler(aeEventLoop *el, int fd, void *privdata, int mask) { client c = privdata; REDIS_NOTUSED(el); REDIS_NOTUSED(fd); REDIS_NOTUSED(mask); - if (c->state == CLIENT_CONNECTING) { - c->state = CLIENT_SENDQUERY; - c->start = mstime(); + /* Initialize request when nothing was written. */ + if (c->written == 0) { + /* Enforce upper bound to number of requests. */ + if (config.requests_issued++ >= config.requests) { + freeClient(c); + return; + } + + /* Really initialize: randomize keys and set start time. */ + if (config.randomkeys) randomizeClientKey(c); + c->start = ustime(); + c->latency = -1; } + if (sdslen(c->obuf) > c->written) { void *ptr = c->obuf+c->written; - int len = sdslen(c->obuf) - c->written; - int nwritten = write(c->fd, ptr, len); + int nwritten = write(c->context->fd,ptr,sdslen(c->obuf)-c->written); if (nwritten == -1) { if (errno != EPIPE) fprintf(stderr, "Writing to socket: %s\n", strerror(errno)); @@ -348,155 +240,235 @@ static void writeHandler(aeEventLoop *el, int fd, void *privdata, int mask) } 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); - c->state = CLIENT_READREPLY; + aeDeleteFileEvent(config.el,c->context->fd,AE_WRITABLE); + aeCreateFileEvent(config.el,c->context->fd,AE_READABLE,readHandler,c); } } } -static client createClient(void) { +static client createClient(char *cmd, size_t len) { + int j; client c = zmalloc(sizeof(struct _client)); - char err[ANET_ERR_LEN]; - c->fd = anetTcpNonBlockConnect(err,config.hostip,config.hostport); - if (c->fd == ANET_ERR) { - zfree(c); - fprintf(stderr,"Connect: %s\n",err); - return NULL; + if (config.hostsocket == NULL) { + c->context = redisConnectNonBlock(config.hostip,config.hostport); + } else { + c->context = redisConnectUnixNonBlock(config.hostsocket); + } + if (c->context->err) { + fprintf(stderr,"Could not connect to Redis at "); + if (config.hostsocket == NULL) + fprintf(stderr,"%s:%d: %s\n",config.hostip,config.hostport,c->context->errstr); + else + fprintf(stderr,"%s: %s\n",config.hostsocket,c->context->errstr); + exit(1); } - anetTcpNoDelay(NULL,c->fd); + /* Queue N requests accordingly to the pipeline size. */ c->obuf = sdsempty(); - c->ibuf = sdsempty(); - c->mbulk = -1; - c->readlen = 0; + for (j = 0; j < config.pipeline; j++) + c->obuf = sdscatlen(c->obuf,cmd,len); + c->randlen = 0; c->written = 0; - c->totreceived = 0; - c->state = CLIENT_CONNECTING; - aeCreateFileEvent(config.el, c->fd, AE_WRITABLE, writeHandler, c); - config.liveclients++; + c->pending = config.pipeline; + + /* Find substrings in the output buffer that need to be randomized. */ + if (config.randomkeys) { + char *p = c->obuf; + while ((p = strstr(p,":rand:")) != NULL) { + assert(c->randlen < (signed)(sizeof(c->randptr)/sizeof(char*))); + c->randptr[c->randlen++] = p+6; + p += 6; + } + } + +/* redisSetReplyObjectFunctions(c->context,NULL); */ + aeCreateFileEvent(config.el,c->context->fd,AE_WRITABLE,writeHandler,c); listAddNodeTail(config.clients,c); + config.liveclients++; return c; } static void createMissingClients(client c) { + int n = 0; + while(config.liveclients < config.numclients) { - client new = createClient(); - if (!new) continue; - sdsfree(new->obuf); - new->obuf = sdsdup(c->obuf); - if (config.randomkeys) randomizeClientKey(c); - prepareClientForReply(new,c->replytype); + createClient(c->obuf,sdslen(c->obuf)/config.pipeline); + + /* Listen backlog is quite limited on most systems */ + if (++n > 64) { + usleep(50000); + n = 0; + } } } +static int compareLatency(const void *a, const void *b) { + return (*(long long*)a)-(*(long long*)b); +} + static void showLatencyReport(void) { - int j, seen = 0; + int i, curlat = 0; float perc, reqpersec; - reqpersec = (float)config.donerequests/((float)config.totlatency/1000); - if (!config.quiet) { + reqpersec = (float)config.requests_finished/((float)config.totlatency/1000); + if (!config.quiet && !config.csv) { printf("====== %s ======\n", config.title); - printf(" %d requests completed in %.2f seconds\n", config.donerequests, + printf(" %d requests completed in %.2f seconds\n", config.requests_finished, (float)config.totlatency/1000); printf(" %d parallel clients\n", config.numclients); printf(" %d bytes payload\n", config.datasize); printf(" keep alive: %d\n", config.keepalive); printf("\n"); - for (j = 0; j <= MAX_LATENCY; j++) { - if (config.latency[j]) { - seen += config.latency[j]; - perc = ((float)seen*100)/config.donerequests; - printf("%.2f%% <= %d milliseconds\n", perc, j); + + qsort(config.latency,config.requests,sizeof(long long),compareLatency); + for (i = 0; i < config.requests; i++) { + if (config.latency[i]/1000 != curlat || i == (config.requests-1)) { + curlat = config.latency[i]/1000; + perc = ((float)(i+1)*100)/config.requests; + printf("%.2f%% <= %d milliseconds\n", perc, curlat); } } printf("%.2f requests per second\n\n", reqpersec); + } else if (config.csv) { + printf("\"%s\",\"%.2f\"\n", config.title, reqpersec); } else { printf("%s: %.2f requests per second\n", config.title, reqpersec); } } -static void prepareForBenchmark(char *title) { - memset(config.latency,0,sizeof(int)*(MAX_LATENCY+1)); +static void benchmark(char *title, char *cmd, int len) { + client c; + config.title = title; - config.start = mstime(); - config.donerequests = 0; -} + config.requests_issued = 0; + config.requests_finished = 0; -static void endBenchmark(void) { + c = createClient(cmd,len); + createMissingClients(c); + + config.start = mstime(); + aeMain(config.el); config.totlatency = mstime()-config.start; + showLatencyReport(); freeAllClients(); } -void parseOptions(int argc, char **argv) { +/* Returns number of consumed options. */ +int parseOptions(int argc, const char **argv) { int i; + int lastarg; + int exit_status = 1; for (i = 1; i < argc; i++) { - int lastarg = i==argc-1; - - if (!strcmp(argv[i],"-c") && !lastarg) { - config.numclients = atoi(argv[i+1]); - i++; - } else if (!strcmp(argv[i],"-n") && !lastarg) { - config.requests = atoi(argv[i+1]); - i++; - } else if (!strcmp(argv[i],"-k") && !lastarg) { - config.keepalive = atoi(argv[i+1]); - i++; - } else if (!strcmp(argv[i],"-h") && !lastarg) { - char *ip = zmalloc(32); - if (anetResolve(NULL,argv[i+1],ip) == ANET_ERR) { - printf("Can't resolve %s\n", argv[i]); - exit(1); - } - config.hostip = ip; - i++; - } else if (!strcmp(argv[i],"-p") && !lastarg) { - config.hostport = atoi(argv[i+1]); - i++; - } else if (!strcmp(argv[i],"-d") && !lastarg) { - config.datasize = atoi(argv[i+1]); - i++; + lastarg = (i == (argc-1)); + + if (!strcmp(argv[i],"-c")) { + if (lastarg) goto invalid; + config.numclients = atoi(argv[++i]); + } else if (!strcmp(argv[i],"-n")) { + if (lastarg) goto invalid; + config.requests = atoi(argv[++i]); + } else if (!strcmp(argv[i],"-k")) { + if (lastarg) goto invalid; + config.keepalive = atoi(argv[++i]); + } else if (!strcmp(argv[i],"-h")) { + if (lastarg) goto invalid; + config.hostip = strdup(argv[++i]); + } else if (!strcmp(argv[i],"-p")) { + if (lastarg) goto invalid; + config.hostport = atoi(argv[++i]); + } else if (!strcmp(argv[i],"-s")) { + if (lastarg) goto invalid; + config.hostsocket = strdup(argv[++i]); + } else if (!strcmp(argv[i],"-d")) { + if (lastarg) goto invalid; + config.datasize = atoi(argv[++i]); if (config.datasize < 1) config.datasize=1; - if (config.datasize > 1024*1024) config.datasize = 1024*1024; - } else if (!strcmp(argv[i],"-r") && !lastarg) { + if (config.datasize > 1024*1024*1024) config.datasize = 1024*1024*1024; + } else if (!strcmp(argv[i],"-P")) { + if (lastarg) goto invalid; + config.pipeline = atoi(argv[++i]); + if (config.pipeline <= 0) config.pipeline=1; + } else if (!strcmp(argv[i],"-r")) { + if (lastarg) goto invalid; config.randomkeys = 1; - config.randomkeys_keyspacelen = atoi(argv[i+1]); + config.randomkeys_keyspacelen = atoi(argv[++i]); if (config.randomkeys_keyspacelen < 0) config.randomkeys_keyspacelen = 0; - i++; } else if (!strcmp(argv[i],"-q")) { config.quiet = 1; + } else if (!strcmp(argv[i],"--csv")) { + config.csv = 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 if (!strcmp(argv[i],"-t")) { + if (lastarg) goto invalid; + /* We get the list of tests to run as a string in the form + * get,set,lrange,...,test_N. Then we add a comma before and + * after the string in order to make sure that searching + * for ",testname," will always get a match if the test is + * enabled. */ + config.tests = sdsnew(","); + config.tests = sdscat(config.tests,(char*)argv[++i]); + config.tests = sdscat(config.tests,","); + sdstolower(config.tests); + } else if (!strcmp(argv[i],"--help")) { + exit_status = 0; + goto usage; } else { - printf("Wrong option '%s' or option argument missing\n\n",argv[i]); - printf("Usage: redis-benchmark [-h ] [-p ] [-c ] [-n [-k ]\n\n"); - printf(" -h Server hostname (default 127.0.0.1)\n"); - printf(" -p Server port (default 6379)\n"); - printf(" -c Number of parallel connections (default 50)\n"); - printf(" -n Total number of requests (default 10000)\n"); - printf(" -d Data size of SET/GET value in bytes (default 2)\n"); - printf(" -k 1=keep alive 0=reconnect (default 1)\n"); - printf(" -r Use random keys for SET/GET/INCR, random values for SADD\n"); - printf(" Using this option the benchmark will get/set keys\n"); - printf(" in the form mykey_rand000000012456 instead of constant\n"); - printf(" keys, the argument determines the max\n"); - printf(" number of values for the random number. For instance\n"); - printf(" if set to 10 only rand000000000000 - rand000000000009\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); + /* Assume the user meant to provide an option when the arg starts + * with a dash. We're done otherwise and should use the remainder + * as the command and arguments for running the benchmark. */ + if (argv[i][0] == '-') goto invalid; + return i; } } + + return i; + +invalid: + printf("Invalid option \"%s\" or option argument missing\n\n",argv[i]); + +usage: + printf( +"Usage: redis-benchmark [-h ] [-p ] [-c ] [-n [-k ]\n\n" +" -h Server hostname (default 127.0.0.1)\n" +" -p Server port (default 6379)\n" +" -s Server socket (overrides host and port)\n" +" -c Number of parallel connections (default 50)\n" +" -n Total number of requests (default 10000)\n" +" -d Data size of SET/GET value in bytes (default 2)\n" +" -k 1=keep alive 0=reconnect (default 1)\n" +" -r Use random keys for SET/GET/INCR, random values for SADD\n" +" Using this option the benchmark will get/set keys\n" +" in the form mykey_rand:000000012456 instead of constant\n" +" keys, the argument determines the max\n" +" number of values for the random number. For instance\n" +" if set to 10 only rand:000000000000 - rand:000000000009\n" +" range will be allowed.\n" +" -P Pipeline requests. Default 1 (no pipeline).\n" +" -q Quiet. Just show query/sec values\n" +" --csv Output in CSV format\n" +" -l Loop. Run the tests forever\n" +" -t Only run the comma separated list of tests. The test\n" +" names are the same as the ones produced as output.\n" +" -I Idle mode. Just open N idle connections and wait.\n\n" +"Examples:\n\n" +" Run the benchmark with the default configuration against 127.0.0.1:6379:\n" +" $ redis-benchmark\n\n" +" Use 20 parallel clients, for a total of 100k requests, against 192.168.1.1:\n" +" $ redis-benchmark -h 192.168.1.1 -p 6379 -n 100000 -c 20\n\n" +" Fill 127.0.0.1:6379 with about 1 million keys only using the SET test:\n" +" $ redis-benchmark -t set -n 1000000 -r 100000000\n\n" +" Benchmark 127.0.0.1:6379 for a few commands producing CSV output:\n" +" $ redis-benchmark -t ping,set,get -n 100000 --csv\n\n" +" Fill a list with 10000 random elements:\n" +" $ redis-benchmark -r 10000 -n 10000 lpush mylist ele:rand:000000000000\n\n" + ); + exit(exit_status); } int showThroughput(struct aeEventLoop *eventLoop, long long id, void *clientData) { @@ -504,41 +476,64 @@ int showThroughput(struct aeEventLoop *eventLoop, long long id, void *clientData REDIS_NOTUSED(id); REDIS_NOTUSED(clientData); + if (config.csv) return 250; float dt = (float)(mstime()-config.start)/1000.0; - float rps = (float)config.donerequests/dt; + float rps = (float)config.requests_finished/dt; printf("%s: %.2f\r", config.title, rps); fflush(stdout); return 250; /* every 250ms */ } -int main(int argc, char **argv) { +/* Return true if the named test was selected using the -t command line + * switch, or if all the tests are selected (no -t passed by user). */ +int test_is_selected(char *name) { + char buf[256]; + int l = strlen(name); + + if (config.tests == NULL) return 1; + buf[0] = ','; + memcpy(buf+1,name,l); + buf[l+1] = ','; + buf[l+2] = '\0'; + return strstr(config.tests,buf) != NULL; +} + +int main(int argc, const char **argv) { + int i; + char *data, *cmd; + int len; + client c; signal(SIGHUP, SIG_IGN); signal(SIGPIPE, SIG_IGN); - config.debug = 0; config.numclients = 50; config.requests = 10000; config.liveclients = 0; - config.el = aeCreateEventLoop(); + config.el = aeCreateEventLoop(1024*10); aeCreateTimeEvent(config.el,1,showThroughput,NULL,NULL); config.keepalive = 1; - config.donerequests = 0; config.datasize = 3; + config.pipeline = 1; config.randomkeys = 0; config.randomkeys_keyspacelen = 0; config.quiet = 0; + config.csv = 0; config.loop = 0; config.idlemode = 0; config.latency = NULL; config.clients = listCreate(); - config.latency = zmalloc(sizeof(int)*(MAX_LATENCY+1)); - config.hostip = "127.0.0.1"; config.hostport = 6379; + config.hostsocket = NULL; + config.tests = NULL; + + i = parseOptions(argc,argv); + argc -= i; + argv += i; - parseOptions(argc,argv); + config.latency = zmalloc(sizeof(long long)*config.requests); if (config.keepalive == 0) { 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"); @@ -546,151 +541,135 @@ 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(); - if (!c) exit(1); - c->obuf = sdsempty(); - prepareClientForReply(c,REPLY_RETCODE); /* will never receive it */ + c = createClient("",0); /* will never receive a reply */ createMissingClients(c); aeMain(config.el); /* and will wait for every */ } + /* Run benchmark with command in the remainder of the arguments. */ + if (argc) { + sds title = sdsnew(argv[0]); + for (i = 1; i < argc; i++) { + title = sdscatlen(title, " ", 1); + title = sdscatlen(title, (char*)argv[i], strlen(argv[i])); + } + + do { + len = redisFormatCommandArgv(&cmd,argc,argv,NULL); + benchmark(title,cmd,len); + free(cmd); + } while(config.loop); + + return 0; + } + + /* Run default benchmark suite. */ do { - prepareForBenchmark("PING"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"PING\r\n"); - prepareClientForReply(c,REPLY_RETCODE); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + data = zmalloc(config.datasize+1); + memset(data,'x',config.datasize); + data[config.datasize] = '\0'; - prepareForBenchmark("PING (multi bulk)"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"*1\r\n$4\r\nPING\r\n"); - prepareClientForReply(c,REPLY_RETCODE); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("ping_inline") || test_is_selected("ping")) + benchmark("PING_INLINE","PING\r\n",6); - prepareForBenchmark("SET"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscatprintf(c->obuf,"SET foo_rand000000000000 %d\r\n",config.datasize); - { - char *data = zmalloc(config.datasize+2); - memset(data,'x',config.datasize); - data[config.datasize] = '\r'; - data[config.datasize+1] = '\n'; - c->obuf = sdscatlen(c->obuf,data,config.datasize+2); + if (test_is_selected("ping_mbulk") || test_is_selected("ping")) { + len = redisFormatCommand(&cmd,"PING"); + benchmark("PING_BULK",cmd,len); + free(cmd); } - prepareClientForReply(c,REPLY_RETCODE); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); - prepareForBenchmark("GET"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"GET foo_rand000000000000\r\n"); - prepareClientForReply(c,REPLY_BULK); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("set")) { + len = redisFormatCommand(&cmd,"SET foo:rand:000000000000 %s",data); + benchmark("SET",cmd,len); + free(cmd); + } - prepareForBenchmark("INCR"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"INCR counter_rand000000000000\r\n"); - prepareClientForReply(c,REPLY_INT); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("get")) { + len = redisFormatCommand(&cmd,"GET foo:rand:000000000000"); + benchmark("GET",cmd,len); + free(cmd); + } - prepareForBenchmark("LPUSH"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"LPUSH mylist 3\r\nbar\r\n"); - prepareClientForReply(c,REPLY_INT); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("incr")) { + len = redisFormatCommand(&cmd,"INCR counter:rand:000000000000"); + benchmark("INCR",cmd,len); + free(cmd); + } - prepareForBenchmark("LPOP"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"LPOP mylist\r\n"); - prepareClientForReply(c,REPLY_BULK); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("lpush")) { + len = redisFormatCommand(&cmd,"LPUSH mylist %s",data); + benchmark("LPUSH",cmd,len); + free(cmd); + } - prepareForBenchmark("SADD"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"SADD myset 24\r\ncounter_rand000000000000\r\n"); - prepareClientForReply(c,REPLY_RETCODE); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("lpop")) { + len = redisFormatCommand(&cmd,"LPOP mylist"); + benchmark("LPOP",cmd,len); + free(cmd); + } - prepareForBenchmark("SPOP"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"SPOP myset\r\n"); - prepareClientForReply(c,REPLY_BULK); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("sadd")) { + len = redisFormatCommand(&cmd, + "SADD myset counter:rand:000000000000"); + benchmark("SADD",cmd,len); + free(cmd); + } - prepareForBenchmark("LPUSH (again, in order to bench LRANGE)"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"LPUSH mylist 3\r\nbar\r\n"); - prepareClientForReply(c,REPLY_RETCODE); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("spop")) { + len = redisFormatCommand(&cmd,"SPOP myset"); + benchmark("SPOP",cmd,len); + free(cmd); + } - prepareForBenchmark("LRANGE (first 100 elements)"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"LRANGE mylist 0 99\r\n"); - prepareClientForReply(c,REPLY_MBULK); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("lrange") || + test_is_selected("lrange_100") || + test_is_selected("lrange_300") || + test_is_selected("lrange_500") || + test_is_selected("lrange_600")) + { + len = redisFormatCommand(&cmd,"LPUSH mylist %s",data); + benchmark("LPUSH (needed to benchmark LRANGE)",cmd,len); + free(cmd); + } - prepareForBenchmark("LRANGE (first 300 elements)"); - c = createClient(); - if (!c) exit(1); - c->obuf = sdscat(c->obuf,"LRANGE mylist 0 299\r\n"); - prepareClientForReply(c,REPLY_MBULK); - createMissingClients(c); - aeMain(config.el); - endBenchmark(); + if (test_is_selected("lrange") || test_is_selected("lrange_100")) { + len = redisFormatCommand(&cmd,"LRANGE mylist 0 99"); + benchmark("LRANGE_100 (first 100 elements)",cmd,len); + free(cmd); + } - prepareForBenchmark("LRANGE (first 450 elements)"); - 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(); + if (test_is_selected("lrange") || test_is_selected("lrange_300")) { + len = redisFormatCommand(&cmd,"LRANGE mylist 0 299"); + benchmark("LRANGE_300 (first 300 elements)",cmd,len); + free(cmd); + } - prepareForBenchmark("LRANGE (first 600 elements)"); - 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(); + if (test_is_selected("lrange") || test_is_selected("lrange_500")) { + len = redisFormatCommand(&cmd,"LRANGE mylist 0 449"); + benchmark("LRANGE_500 (first 450 elements)",cmd,len); + free(cmd); + } - printf("\n"); + if (test_is_selected("lrange") || test_is_selected("lrange_600")) { + len = redisFormatCommand(&cmd,"LRANGE mylist 0 599"); + benchmark("LRANGE_600 (first 600 elements)",cmd,len); + free(cmd); + } + + if (test_is_selected("mset")) { + const char *argv[21]; + argv[0] = "MSET"; + for (i = 1; i < 21; i += 2) { + argv[i] = "foo:rand:000000000000"; + argv[i+1] = data; + } + len = redisFormatCommandArgv(&cmd,21,argv,NULL); + benchmark("MSET (10 keys)",cmd,len); + free(cmd); + } + + if (!config.csv) printf("\n"); } while(config.loop); return 0;