Added header file and example for usage from libev

master
Pieter Noordhuis 2010-10-19 17:10:01 +02:00
parent 206868de06
commit e245ab48ec
4 changed files with 125 additions and 2 deletions

2
.gitignore vendored
View File

@ -1,6 +1,6 @@
/hiredis-test
/hiredis-example
/libevent-example
/*-example
/*.o
/*.so
/*.dylib

View File

@ -61,11 +61,14 @@ test: hiredis-test
libevent-example: extra/hiredis/libevent.h libevent-example.c ${DYLIBNAME}
$(CC) -o $@ $(CCOPT) $(DEBUG) -I. -Iextra -L. -lhiredis -levent libevent-example.c
libev-example: extra/hiredis/libev.h libev-example.c ${DYLIBNAME}
$(CC) -o $@ $(CCOPT) $(DEBUG) -I. -Iextra -L. -lhiredis -lev libev-example.c
.c.o:
$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
clean:
rm -rf ${DYLIBNAME} ${STLIBNAME} $(BINS) libevent-example *.o *.gcda *.gcno *.gcov
rm -rf ${DYLIBNAME} ${STLIBNAME} $(BINS) *-example *.o *.gcda *.gcno *.gcov
dep:
$(CC) -MM *.c

90
extra/hiredis/libev.h Normal file
View File

@ -0,0 +1,90 @@
#include <sys/types.h>
#include <ev.h>
#include <hiredis.h>
/* Prototype for the error callback. */
typedef void (redisErrorCallback)(const redisContext*);
typedef struct libevRedisEvents {
redisContext *context;
redisErrorCallback *err;
struct ev_loop *loop;
ev_io rev, wev;
} libevRedisEvents;
void libevRedisReadEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
((void)loop); ((void)revents);
libevRedisEvents *e = watcher->data;
if (redisBufferRead(e->context) == REDIS_ERR) {
e->err(e->context);
} else {
if (redisProcessCallbacks(e->context) == REDIS_ERR) {
e->err(e->context);
}
}
}
void libevRedisWriteEvent(struct ev_loop *loop, ev_io *watcher, int revents) {
((void)loop); ((void)revents);
libevRedisEvents *e = watcher->data;
int done = 0;
if (redisBufferWrite(e->context, &done) == REDIS_ERR) {
ev_io_stop(e->loop,&e->wev);
e->err(e->context);
} else {
/* Stop firing the write event when done */
if (done) {
ev_io_stop(e->loop,&e->wev);
ev_io_start(e->loop,&e->rev);
}
}
}
void libevRedisCommandCallback(redisContext *c, void *privdata) {
((void)c);
libevRedisEvents *e = privdata;
ev_io_start(e->loop,&e->wev);
}
void libevRedisDisconnectCallback(redisContext *c, void *privdata) {
((void)c);
libevRedisEvents *e = privdata;
ev_io_stop(e->loop,&e->rev);
ev_io_stop(e->loop,&e->wev);
}
void libevRedisFreeCallback(redisContext *c, void *privdata) {
((void)c);
libevRedisEvents *e = privdata;
free(e);
}
redisContext *libevRedisConnect(struct ev_loop *loop, redisErrorCallback *err, const char *ip, int port) {
libevRedisEvents *e;
redisContext *c = redisConnectNonBlock(ip, port, NULL);
if (c->error != NULL) {
err(c);
redisFree(c);
return NULL;
}
/* Create container for context and r/w events */
e = malloc(sizeof(*e));
e->loop = loop;
e->context = c;
e->err = err;
e->rev.data = e;
e->wev.data = e;
/* Register callbacks */
redisSetDisconnectCallback(c,libevRedisDisconnectCallback,e);
redisSetCommandCallback(c,libevRedisCommandCallback,e);
redisSetFreeCallback(c,libevRedisFreeCallback,e);
/* Initialize read/write events */
ev_io_init(&e->rev,libevRedisReadEvent,c->fd,EV_READ);
ev_io_init(&e->wev,libevRedisWriteEvent,c->fd,EV_WRITE);
return c;
}

30
libev-example.c Normal file
View File

@ -0,0 +1,30 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <hiredis/libev.h>
#include <signal.h>
void getCallback(redisContext *c, redisReply *reply, const void *privdata) {
printf("argv[%s]: %s\n", (const char*)privdata, reply->reply);
/* Disconnect after receiving the reply to GET */
redisDisconnect(c);
}
void errorCallback(const redisContext *c) {
printf("Error: %s\n", c->error);
}
int main (int argc, char **argv) {
signal(SIGPIPE, SIG_IGN);
struct ev_loop *loop = ev_default_loop(0);
redisContext *c = libevRedisConnect(loop, errorCallback, "127.0.0.1", 6379);
if (c == NULL) return 1;
redisCommand(c, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
redisCommandWithCallback(c, getCallback, "end-1", "GET key");
ev_loop(loop, 0);
redisFree(c);
return 0;
}