Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
0bf4dded
Commit
0bf4dded
authored
Jun 27, 2011
by
R. Tyler Croy
Browse files
Convert the rest of the async adapters contain static functions for easier linking
parent
62c8917f
Changes
2
Hide whitespace changes
Inline
Side-by-side
adapters/ae.h
View file @
0bf4dded
#ifndef __HIREDIS_AE_H__
#define __HIREDIS_AE_H__
#include <sys/types.h>
#include <ae.h>
#include "../hiredis.h"
...
...
@@ -10,21 +12,21 @@ typedef struct redisAeEvents {
int
reading
,
writing
;
}
redisAeEvents
;
void
redisAeReadEvent
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
static
void
redisAeReadEvent
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
((
void
)
el
);
((
void
)
fd
);
((
void
)
mask
);
redisAeEvents
*
e
=
(
redisAeEvents
*
)
privdata
;
redisAsyncHandleRead
(
e
->
context
);
}
void
redisAeWriteEvent
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
static
void
redisAeWriteEvent
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
((
void
)
el
);
((
void
)
fd
);
((
void
)
mask
);
redisAeEvents
*
e
=
(
redisAeEvents
*
)
privdata
;
redisAsyncHandleWrite
(
e
->
context
);
}
void
redisAeAddRead
(
void
*
privdata
)
{
static
void
redisAeAddRead
(
void
*
privdata
)
{
redisAeEvents
*
e
=
(
redisAeEvents
*
)
privdata
;
aeEventLoop
*
loop
=
e
->
loop
;
if
(
!
e
->
reading
)
{
...
...
@@ -33,7 +35,7 @@ void redisAeAddRead(void *privdata) {
}
}
void
redisAeDelRead
(
void
*
privdata
)
{
static
void
redisAeDelRead
(
void
*
privdata
)
{
redisAeEvents
*
e
=
(
redisAeEvents
*
)
privdata
;
aeEventLoop
*
loop
=
e
->
loop
;
if
(
e
->
reading
)
{
...
...
@@ -42,7 +44,7 @@ void redisAeDelRead(void *privdata) {
}
}
void
redisAeAddWrite
(
void
*
privdata
)
{
static
void
redisAeAddWrite
(
void
*
privdata
)
{
redisAeEvents
*
e
=
(
redisAeEvents
*
)
privdata
;
aeEventLoop
*
loop
=
e
->
loop
;
if
(
!
e
->
writing
)
{
...
...
@@ -51,7 +53,7 @@ void redisAeAddWrite(void *privdata) {
}
}
void
redisAeDelWrite
(
void
*
privdata
)
{
static
void
redisAeDelWrite
(
void
*
privdata
)
{
redisAeEvents
*
e
=
(
redisAeEvents
*
)
privdata
;
aeEventLoop
*
loop
=
e
->
loop
;
if
(
e
->
writing
)
{
...
...
@@ -60,14 +62,14 @@ void redisAeDelWrite(void *privdata) {
}
}
void
redisAeCleanup
(
void
*
privdata
)
{
static
void
redisAeCleanup
(
void
*
privdata
)
{
redisAeEvents
*
e
=
(
redisAeEvents
*
)
privdata
;
redisAeDelRead
(
privdata
);
redisAeDelWrite
(
privdata
);
free
(
e
);
}
int
redisAeAttach
(
aeEventLoop
*
loop
,
redisAsyncContext
*
ac
)
{
static
int
redisAeAttach
(
aeEventLoop
*
loop
,
redisAsyncContext
*
ac
)
{
redisContext
*
c
=
&
(
ac
->
c
);
redisAeEvents
*
e
;
...
...
@@ -92,4 +94,4 @@ int redisAeAttach(aeEventLoop *loop, redisAsyncContext *ac) {
return
REDIS_OK
;
}
#endif
adapters/libevent.h
View file @
0bf4dded
#ifndef __HIREDIS_LIBEVENT_H__
#define __HIREDIS_LIBEVENT_H__
#include <event.h>
#include "../hiredis.h"
#include "../async.h"
...
...
@@ -7,46 +9,46 @@ typedef struct redisLibeventEvents {
struct
event
rev
,
wev
;
}
redisLibeventEvents
;
void
redisLibeventReadEvent
(
int
fd
,
short
event
,
void
*
arg
)
{
static
void
redisLibeventReadEvent
(
int
fd
,
short
event
,
void
*
arg
)
{
((
void
)
fd
);
((
void
)
event
);
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
arg
;
redisAsyncHandleRead
(
e
->
context
);
}
void
redisLibeventWriteEvent
(
int
fd
,
short
event
,
void
*
arg
)
{
static
void
redisLibeventWriteEvent
(
int
fd
,
short
event
,
void
*
arg
)
{
((
void
)
fd
);
((
void
)
event
);
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
arg
;
redisAsyncHandleWrite
(
e
->
context
);
}
void
redisLibeventAddRead
(
void
*
privdata
)
{
static
void
redisLibeventAddRead
(
void
*
privdata
)
{
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
privdata
;
event_add
(
&
e
->
rev
,
NULL
);
}
void
redisLibeventDelRead
(
void
*
privdata
)
{
static
void
redisLibeventDelRead
(
void
*
privdata
)
{
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
privdata
;
event_del
(
&
e
->
rev
);
}
void
redisLibeventAddWrite
(
void
*
privdata
)
{
static
void
redisLibeventAddWrite
(
void
*
privdata
)
{
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
privdata
;
event_add
(
&
e
->
wev
,
NULL
);
}
void
redisLibeventDelWrite
(
void
*
privdata
)
{
static
void
redisLibeventDelWrite
(
void
*
privdata
)
{
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
privdata
;
event_del
(
&
e
->
wev
);
}
void
redisLibeventCleanup
(
void
*
privdata
)
{
static
void
redisLibeventCleanup
(
void
*
privdata
)
{
redisLibeventEvents
*
e
=
(
redisLibeventEvents
*
)
privdata
;
event_del
(
&
e
->
rev
);
event_del
(
&
e
->
wev
);
free
(
e
);
}
int
redisLibeventAttach
(
redisAsyncContext
*
ac
,
struct
event_base
*
base
)
{
static
int
redisLibeventAttach
(
redisAsyncContext
*
ac
,
struct
event_base
*
base
)
{
redisContext
*
c
=
&
(
ac
->
c
);
redisLibeventEvents
*
e
;
...
...
@@ -73,3 +75,4 @@ int redisLibeventAttach(redisAsyncContext *ac, struct event_base *base) {
event_base_set
(
base
,
&
e
->
wev
);
return
REDIS_OK
;
}
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment