Commit fb49cd19 authored by Pieter Noordhuis's avatar Pieter Noordhuis
Browse files

Make the libev adapter work without support for multiple event loops

parent 808e43e1
...@@ -10,47 +10,63 @@ typedef struct redisLibevEvents { ...@@ -10,47 +10,63 @@ typedef struct redisLibevEvents {
ev_io rev, wev; ev_io rev, wev;
} redisLibevEvents; } redisLibevEvents;
void redisLibevReadEvent(struct ev_loop *loop, ev_io *watcher, int revents) { void redisLibevReadEvent(EV_P_ ev_io *watcher, int revents) {
((void)loop); ((void)revents); #if EV_MULTIPLICITY
((void)loop);
#endif
((void)revents);
redisLibevEvents *e = (redisLibevEvents*)watcher->data; redisLibevEvents *e = (redisLibevEvents*)watcher->data;
redisAsyncHandleRead(e->context); redisAsyncHandleRead(e->context);
} }
void redisLibevWriteEvent(struct ev_loop *loop, ev_io *watcher, int revents) { void redisLibevWriteEvent(EV_P_ ev_io *watcher, int revents) {
((void)loop); ((void)revents); #if EV_MULTIPLICITY
((void)loop);
#endif
((void)revents);
redisLibevEvents *e = (redisLibevEvents*)watcher->data; redisLibevEvents *e = (redisLibevEvents*)watcher->data;
redisAsyncHandleWrite(e->context); redisAsyncHandleWrite(e->context);
} }
void redisLibevAddRead(void *privdata) { void redisLibevAddRead(void *privdata) {
redisLibevEvents *e = (redisLibevEvents*)privdata; redisLibevEvents *e = (redisLibevEvents*)privdata;
struct ev_loop *loop = e->loop;
((void)loop);
if (!e->reading) { if (!e->reading) {
e->reading = 1; e->reading = 1;
ev_io_start(e->loop,&e->rev); ev_io_start(EV_A_ &e->rev);
} }
} }
void redisLibevDelRead(void *privdata) { void redisLibevDelRead(void *privdata) {
redisLibevEvents *e = (redisLibevEvents*)privdata; redisLibevEvents *e = (redisLibevEvents*)privdata;
struct ev_loop *loop = e->loop;
((void)loop);
if (e->reading) { if (e->reading) {
e->reading = 0; e->reading = 0;
ev_io_stop(e->loop,&e->rev); ev_io_stop(EV_A_ &e->rev);
} }
} }
void redisLibevAddWrite(void *privdata) { void redisLibevAddWrite(void *privdata) {
redisLibevEvents *e = (redisLibevEvents*)privdata; redisLibevEvents *e = (redisLibevEvents*)privdata;
struct ev_loop *loop = e->loop;
((void)loop);
if (!e->writing) { if (!e->writing) {
e->writing = 1; e->writing = 1;
ev_io_start(e->loop,&e->wev); ev_io_start(EV_A_ &e->wev);
} }
} }
void redisLibevDelWrite(void *privdata) { void redisLibevDelWrite(void *privdata) {
redisLibevEvents *e = (redisLibevEvents*)privdata; redisLibevEvents *e = (redisLibevEvents*)privdata;
struct ev_loop *loop = e->loop;
((void)loop);
if (e->writing) { if (e->writing) {
e->writing = 0; e->writing = 0;
ev_io_stop(e->loop,&e->wev); ev_io_stop(EV_A_ &e->wev);
} }
} }
...@@ -61,7 +77,7 @@ void redisLibevCleanup(void *privdata) { ...@@ -61,7 +77,7 @@ void redisLibevCleanup(void *privdata) {
free(e); free(e);
} }
int redisLibevAttach(redisAsyncContext *ac, struct ev_loop *loop) { int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
redisContext *c = &(ac->c); redisContext *c = &(ac->c);
redisLibevEvents *e; redisLibevEvents *e;
...@@ -72,7 +88,11 @@ int redisLibevAttach(redisAsyncContext *ac, struct ev_loop *loop) { ...@@ -72,7 +88,11 @@ int redisLibevAttach(redisAsyncContext *ac, struct ev_loop *loop) {
/* Create container for context and r/w events */ /* Create container for context and r/w events */
e = (redisLibevEvents*)malloc(sizeof(*e)); e = (redisLibevEvents*)malloc(sizeof(*e));
e->context = ac; e->context = ac;
#if EV_MULTIPLICITY
e->loop = loop; e->loop = loop;
#else
e->loop = NULL;
#endif
e->reading = e->writing = 0; e->reading = e->writing = 0;
e->rev.data = e; e->rev.data = e;
e->wev.data = e; e->wev.data = e;
......
...@@ -23,7 +23,6 @@ void disconnectCallback(const redisAsyncContext *c, int status) { ...@@ -23,7 +23,6 @@ void disconnectCallback(const redisAsyncContext *c, int status) {
int main (int argc, char **argv) { int main (int argc, char **argv) {
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
struct ev_loop *loop = ev_default_loop(0);
redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379); redisAsyncContext *c = redisAsyncConnect("127.0.0.1", 6379);
if (c->err) { if (c->err) {
...@@ -32,10 +31,10 @@ int main (int argc, char **argv) { ...@@ -32,10 +31,10 @@ int main (int argc, char **argv) {
return 1; return 1;
} }
redisLibevAttach(c,loop); redisLibevAttach(EV_DEFAULT_ c);
redisAsyncSetDisconnectCallback(c,disconnectCallback); redisAsyncSetDisconnectCallback(c,disconnectCallback);
redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1])); redisAsyncCommand(c, NULL, NULL, "SET key %b", argv[argc-1], strlen(argv[argc-1]));
redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key"); redisAsyncCommand(c, getCallback, (char*)"end-1", "GET key");
ev_loop(loop, 0); ev_loop(EV_DEFAULT_ 0);
return 0; return 0;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment