#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 {
- int debug;
+ aeEventLoop *el;
+ const char *hostip;
+ int hostport;
+ const char *hostsocket;
int numclients;
int requests;
int liveclients;
int datasize;
int randomkeys;
int randomkeys_keyspacelen;
- aeEventLoop *el;
- char *hostip;
- int hostport;
- char *hostsocket;
int keepalive;
long long start;
long long totlatency;
long long *latency;
- char *title;
+ const char *title;
list *clients;
int quiet;
int loop;
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;
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;
+ size_t i, r;
- if (c->randptr == NULL) return;
-
- /* 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) {
}
if (config.keepalive) {
resetClient(c);
- if (config.randomkeys) randomizeClientKey(c);
} else {
config.liveclients--;
createMissingClients(c);
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);
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(const char *cmd, size_t len) {
client c = zmalloc(sizeof(struct _client));
if (config.hostsocket == NULL) {
c->context = redisConnectNonBlock(config.hostip,config.hostport);
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);
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) {
n = 0;
}
}
-
- /* Start the timer once the connection are established */
- config.start = mstime();
}
static int compareLatency(const void *a, const void *b) {
}
}
-static void prepareForBenchmark(char *title) {
+static void benchmark(const char *title, const 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();
}
-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) {
- config.hostip = argv[i+1];
- i++;
- } else if (!strcmp(argv[i],"-p") && !lastarg) {
- config.hostport = atoi(argv[i+1]);
- i++;
- } else if (!strcmp(argv[i],"-s") && !lastarg) {
- config.hostsocket = 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) {
+ } 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],"-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],"--help")) {
+ exit_status = 0;
+ goto usage;
} 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");
- printf(" -h <hostname> Server hostname (default 127.0.0.1)\n");
- printf(" -p <port> Server port (default 6379)\n");
- printf(" -s <socket> Server socket (overrides host and port)\n");
- printf(" -c <clients> Number of parallel connections (default 50)\n");
- printf(" -n <requests> Total number of requests (default 10000)\n");
- printf(" -d <size> Data size of SET/GET value in bytes (default 2)\n");
- printf(" -k <boolean> 1=keep alive 0=reconnect (default 1)\n");
- printf(" -r <keyspacelen> 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 <keyspacelen> 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 <host>] [-p <port>] [-c <clients>] [-n <requests]> [-k <boolean>]\n\n");
+ printf(" -h <hostname> Server hostname (default 127.0.0.1)\n");
+ printf(" -p <port> Server port (default 6379)\n");
+ printf(" -s <socket> Server socket (overrides host and port)\n");
+ printf(" -c <clients> Number of parallel connections (default 50)\n");
+ printf(" -n <requests> Total number of requests (default 10000)\n");
+ printf(" -d <size> Data size of SET/GET value in bytes (default 2)\n");
+ printf(" -k <boolean> 1=keep alive 0=reconnect (default 1)\n");
+ printf(" -r <keyspacelen> 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 <keyspacelen> 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");
+ exit(exit_status);
}
int showThroughput(struct aeEventLoop *eventLoop, long long id, void *clientData) {
return 250; /* every 250ms */
}
-int main(int argc, char **argv) {
+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.hostport = 6379;
config.hostsocket = NULL;
- parseOptions(argc,argv);
+ i = parseOptions(argc,argv);
+ argc -= i;
+ argv += i;
+
config.latency = zmalloc(sizeof(long long)*config.requests);
if (config.keepalive == 0) {
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 */
}
- do {
- char *data, *cmd;
- int len;
+ /* 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 {
data = zmalloc(config.datasize+1);
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);
projects / redis.git / blobdiff