#include <assert.h>
#include "ae.h"
-#include "anet.h"
+#include "hiredis.h"
#include "sds.h"
#include "adlist.h"
#include "zmalloc.h"
} config;
typedef struct _client {
+ redisContext *context;
int state;
- int fd;
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 */
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);
}
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);
}
static void randomizeClientKey(client c) {
memcpy(p,buf,strlen(buf));
}
-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;
- }
-}
-
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) {
freeClient(c);
aeStop(config.el);
}
}
-/* 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;
- }
-
- 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;
- }
- }
-
- 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--;
- } 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;
- }
- }
+ if (redisBufferRead(c->context) != REDIS_OK) {
+ fprintf(stderr,"Error: %s\n",c->context->errstr);
+ exit(1);
+ } else {
+ if (redisGetReply(c->context,&reply) != REDIS_OK) {
+ fprintf(stderr,"Error: %s\n",c->context->errstr);
+ exit(1);
}
-
- if (c->mbulk == 0)
- goto done;
+ if (reply != NULL)
+ clientDone(c);
}
-
-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);
}
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));
}
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);
+ 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(void) {
+static client createClient(int replytype) {
client c = zmalloc(sizeof(struct _client));
- char err[ANET_ERR_LEN];
-
- if (config.hostsocket == NULL)
- c->fd = anetTcpNonBlockConnect(err,config.hostip,config.hostport);
- else
- c->fd = anetUnixNonBlockConnect(err,config.hostsocket);
-
- 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);
}
- anetTcpNoDelay(NULL,c->fd);
+ 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);
+ }
+ c->replytype = replytype;
+ c->state = CLIENT_CONNECTING;
c->obuf = sdsempty();
- c->ibuf = sdsempty();
- c->mbulk = -1;
- c->readlen = 0;
c->written = 0;
- c->totreceived = 0;
- c->state = CLIENT_CONNECTING;
- aeCreateFileEvent(config.el, c->fd, AE_WRITABLE, writeHandler, c);
- config.liveclients++;
+ 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) {
while(config.liveclients < config.numclients) {
- client new = createClient();
- if (!new) continue;
+ client new = createClient(c->replytype);
sdsfree(new->obuf);
new->obuf = sdsdup(c->obuf);
if (config.randomkeys) randomizeClientKey(c);
- prepareClientForReply(new,c->replytype);
}
}
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;
+ config.hostip = argv[i+1];
i++;
} else if (!strcmp(argv[i],"-p") && !lastarg) {
config.hostport = atoi(argv[i+1]);
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 = createClient(0); /* will never receive a reply */
c->obuf = sdsempty();
- prepareClientForReply(c,REPLY_RETCODE); /* will never receive it */
createMissingClients(c);
aeMain(config.el);
/* and will wait for every */
do {
prepareForBenchmark("PING");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STATUS);
c->obuf = sdscat(c->obuf,"PING\r\n");
- prepareClientForReply(c,REPLY_RETCODE);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("PING (multi bulk)");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STATUS);
c->obuf = sdscat(c->obuf,"*1\r\n$4\r\nPING\r\n");
- prepareClientForReply(c,REPLY_RETCODE);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("MSET (10 keys, multi bulk)");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_ARRAY);
c->obuf = sdscatprintf(c->obuf,"*%d\r\n$4\r\nMSET\r\n", 11);
{
int i;
}
zfree(data);
}
- prepareClientForReply(c,REPLY_RETCODE);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("SET");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STATUS);
c->obuf = sdscat(c->obuf,"SET foo_rand000000000000 ");
{
char *data = zmalloc(config.datasize+2);
data[config.datasize+1] = '\n';
c->obuf = sdscatlen(c->obuf,data,config.datasize+2);
}
- prepareClientForReply(c,REPLY_RETCODE);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("GET");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STRING);
c->obuf = sdscat(c->obuf,"GET foo_rand000000000000\r\n");
- prepareClientForReply(c,REPLY_BULK);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("INCR");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_INTEGER);
c->obuf = sdscat(c->obuf,"INCR counter_rand000000000000\r\n");
- prepareClientForReply(c,REPLY_INT);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("LPUSH");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_INTEGER);
c->obuf = sdscat(c->obuf,"LPUSH mylist bar\r\n");
- prepareClientForReply(c,REPLY_INT);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("LPOP");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STRING);
c->obuf = sdscat(c->obuf,"LPOP mylist\r\n");
- prepareClientForReply(c,REPLY_BULK);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("SADD");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STATUS);
c->obuf = sdscat(c->obuf,"SADD myset counter_rand000000000000\r\n");
- prepareClientForReply(c,REPLY_RETCODE);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("SPOP");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STRING);
c->obuf = sdscat(c->obuf,"SPOP myset\r\n");
- prepareClientForReply(c,REPLY_BULK);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("LPUSH (again, in order to bench LRANGE)");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_STATUS);
c->obuf = sdscat(c->obuf,"LPUSH mylist bar\r\n");
- prepareClientForReply(c,REPLY_RETCODE);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("LRANGE (first 100 elements)");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_ARRAY);
c->obuf = sdscat(c->obuf,"LRANGE mylist 0 99\r\n");
- prepareClientForReply(c,REPLY_MBULK);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("LRANGE (first 300 elements)");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_ARRAY);
c->obuf = sdscat(c->obuf,"LRANGE mylist 0 299\r\n");
- prepareClientForReply(c,REPLY_MBULK);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("LRANGE (first 450 elements)");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_ARRAY);
c->obuf = sdscat(c->obuf,"LRANGE mylist 0 449\r\n");
- prepareClientForReply(c,REPLY_MBULK);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
prepareForBenchmark("LRANGE (first 600 elements)");
- c = createClient();
- if (!c) exit(1);
+ c = createClient(REDIS_REPLY_ARRAY);
c->obuf = sdscat(c->obuf,"LRANGE mylist 0 599\r\n");
- prepareClientForReply(c,REPLY_MBULK);
createMissingClients(c);
aeMain(config.el);
endBenchmark();
projects / redis.git / commitdiff
