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
994d2fd7
Unverified
Commit
994d2fd7
authored
May 04, 2020
by
Michael Grunder
Committed by
GitHub
May 04, 2020
Browse files
Support timeouts in libev adapater (#795)
Add support for timeouts in our libev adapter. See #795
parent
2cb203c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
adapters/libev.h
View file @
994d2fd7
...
...
@@ -41,6 +41,7 @@ typedef struct redisLibevEvents {
struct
ev_loop
*
loop
;
int
reading
,
writing
;
ev_io
rev
,
wev
;
ev_timer
timer
;
}
redisLibevEvents
;
static
void
redisLibevReadEvent
(
EV_P_
ev_io
*
watcher
,
int
revents
)
{
...
...
@@ -103,13 +104,41 @@ static void redisLibevDelWrite(void *privdata) {
}
}
static
void
redisLibevStopTimer
(
void
*
privdata
)
{
redisLibevEvents
*
e
=
(
redisLibevEvents
*
)
privdata
;
struct
ev_loop
*
loop
=
e
->
loop
;
((
void
)
loop
);
ev_timer_stop
(
EV_A_
&
e
->
timer
);
}
static
void
redisLibevCleanup
(
void
*
privdata
)
{
redisLibevEvents
*
e
=
(
redisLibevEvents
*
)
privdata
;
redisLibevDelRead
(
privdata
);
redisLibevDelWrite
(
privdata
);
redisLibevStopTimer
(
privdata
);
free
(
e
);
}
static
void
redisLibevTimeout
(
EV_P_
ev_timer
*
timer
,
int
revents
)
{
((
void
)
revents
);
redisLibevEvents
*
e
=
timer
->
data
;
redisAsyncHandleTimeout
(
e
->
context
);
}
static
void
redisLibevSetTimeout
(
void
*
privdata
,
struct
timeval
tv
)
{
redisLibevEvents
*
e
=
privdata
;
struct
ev_loop
*
loop
=
e
->
loop
;
((
void
)
loop
);
if
(
!
ev_is_active
(
&
e
->
timer
))
{
ev_init
(
&
e
->
timer
,
redisLibevTimeout
);
e
->
timer
.
data
=
e
;
}
e
->
timer
.
repeat
=
tv
.
tv_sec
+
tv
.
tv_usec
/
1000000
.
00
;
ev_timer_again
(
EV_A_
&
e
->
timer
);
}
static
int
redisLibevAttach
(
EV_P_
redisAsyncContext
*
ac
)
{
redisContext
*
c
=
&
(
ac
->
c
);
redisLibevEvents
*
e
;
...
...
@@ -119,14 +148,13 @@ static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
return
REDIS_ERR
;
/* Create container for context and r/w events */
e
=
(
redisLibevEvents
*
)
hi_
m
alloc
(
sizeof
(
*
e
));
e
=
(
redisLibevEvents
*
)
hi_
c
alloc
(
1
,
sizeof
(
*
e
));
e
->
context
=
ac
;
#if EV_MULTIPLICITY
e
->
loop
=
loop
;
#else
e
->
loop
=
NULL
;
#endif
e
->
reading
=
e
->
writing
=
0
;
e
->
rev
.
data
=
e
;
e
->
wev
.
data
=
e
;
...
...
@@ -136,6 +164,7 @@ static int redisLibevAttach(EV_P_ redisAsyncContext *ac) {
ac
->
ev
.
addWrite
=
redisLibevAddWrite
;
ac
->
ev
.
delWrite
=
redisLibevDelWrite
;
ac
->
ev
.
cleanup
=
redisLibevCleanup
;
ac
->
ev
.
scheduleTimer
=
redisLibevSetTimeout
;
ac
->
ev
.
data
=
e
;
/* Initialize read/write events */
...
...
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