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
75cb6c1e
Commit
75cb6c1e
authored
Oct 03, 2021
by
Arseniy Simonov
Committed by
Michael Grunder
Aug 29, 2022
Browse files
Do store command timeout in the context for redisSetTimeout (#593)
parent
c57cad65
Changes
2
Hide whitespace changes
Inline
Side-by-side
net.c
View file @
75cb6c1e
...
...
@@ -50,6 +50,8 @@
/* Defined in hiredis.c */
void
__redisSetError
(
redisContext
*
c
,
int
type
,
const
char
*
str
);
int
redisContextUpdateCommandTimeout
(
redisContext
*
c
,
const
struct
timeval
*
timeout
);
void
redisNetClose
(
redisContext
*
c
)
{
if
(
c
&&
c
->
fd
!=
REDIS_INVALID_FD
)
{
close
(
c
->
fd
);
...
...
@@ -333,6 +335,10 @@ int redisContextSetTimeout(redisContext *c, const struct timeval tv) {
const
void
*
to_ptr
=
&
tv
;
size_t
to_sz
=
sizeof
(
tv
);
if
(
redisContextUpdateCommandTimeout
(
c
,
&
tv
)
!=
REDIS_OK
)
{
__redisSetError
(
c
,
REDIS_ERR_OOM
,
"Out of memory"
);
return
REDIS_ERR
;
}
if
(
setsockopt
(
c
->
fd
,
SOL_SOCKET
,
SO_RCVTIMEO
,
to_ptr
,
to_sz
)
==
-
1
)
{
__redisSetErrorFromErrno
(
c
,
REDIS_ERR_IO
,
"setsockopt(SO_RCVTIMEO)"
);
return
REDIS_ERR
;
...
...
test.c
View file @
75cb6c1e
...
...
@@ -1156,7 +1156,13 @@ static void test_blocking_connection_timeouts(struct config config) {
test
(
"Does not return a reply when the command times out: "
);
if
(
detect_debug_sleep
(
c
))
{
redisAppendFormattedCommand
(
c
,
sleep_cmd
,
strlen
(
sleep_cmd
));
// flush connection buffer without waiting for the reply
s
=
c
->
funcs
->
write
(
c
);
assert
(
s
==
(
ssize_t
)
sdslen
(
c
->
obuf
));
sdsfree
(
c
->
obuf
);
c
->
obuf
=
sdsempty
();
tv
.
tv_sec
=
0
;
tv
.
tv_usec
=
10000
;
redisSetTimeout
(
c
,
tv
);
...
...
@@ -1169,6 +1175,9 @@ static void test_blocking_connection_timeouts(struct config config) {
strcmp
(
c
->
errstr
,
"recv timeout"
)
==
0
);
#endif
freeReplyObject
(
reply
);
// wait for the DEBUG SLEEP to complete so that Redis server is unblocked for the following tests
sleep
(
3
);
}
else
{
test_skipped
();
}
...
...
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