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
5eb69588
Commit
5eb69588
authored
Feb 21, 2019
by
Mark Nunberg
Browse files
Allow option for async connections to not automatically free
parent
1ec4aefb
Changes
3
Hide whitespace changes
Inline
Side-by-side
async.c
View file @
5eb69588
...
...
@@ -361,7 +361,9 @@ static void __redisAsyncDisconnect(redisAsyncContext *ac) {
/* For non-clean disconnects, __redisAsyncFree() will execute pending
* callbacks with a NULL-reply. */
__redisAsyncFree
(
ac
);
if
(
!
(
c
->
flags
&
REDIS_NO_AUTO_FREE
))
{
__redisAsyncFree
(
ac
);
}
}
/* Tries to do a clean disconnect from Redis, meaning it stops new commands
...
...
@@ -373,6 +375,9 @@ static void __redisAsyncDisconnect(redisAsyncContext *ac) {
void
redisAsyncDisconnect
(
redisAsyncContext
*
ac
)
{
redisContext
*
c
=
&
(
ac
->
c
);
c
->
flags
|=
REDIS_DISCONNECTING
;
/** unset the auto-free flag here, because disconnect undoes this */
c
->
flags
&=
~
REDIS_NO_AUTO_FREE
;
if
(
!
(
c
->
flags
&
REDIS_IN_CALLBACK
)
&&
ac
->
replies
.
head
==
NULL
)
__redisAsyncDisconnect
(
ac
);
}
...
...
hiredis.c
View file @
5eb69588
...
...
@@ -668,6 +668,9 @@ redisContext *redisConnectWithOptions(const redisOptions *options) {
if
(
options
->
options
&
REDIS_OPT_REUSEADDR
)
{
c
->
flags
|=
REDIS_REUSEADDR
;
}
if
(
options
->
options
&
REDIS_OPT_NOAUTOFREE
)
{
c
->
flags
|=
REDIS_NO_AUTO_FREE
;
}
if
(
options
->
type
==
REDIS_CONN_TCP
)
{
redisContextConnectBindTcp
(
c
,
options
->
endpoint
.
tcp
.
ip
,
...
...
hiredis.h
View file @
5eb69588
...
...
@@ -77,6 +77,12 @@
/* Flag that is set when this connection is done through SSL */
#define REDIS_SSL 0x100
/**
* Flag that indicates the user does not want the context to
* be automatically freed upon error
*/
#define REDIS_NO_AUTO_FREE 0x200
#define REDIS_KEEPALIVE_INTERVAL 15
/* seconds */
/* number of times we retry to connect in the case of EADDRNOTAVAIL and
...
...
@@ -121,6 +127,12 @@ struct redisSsl;
#define REDIS_OPT_NONBLOCK 0x01
#define REDIS_OPT_REUSEADDR 0x02
/**
* Don't automatically free the async object on a connection failure,
* or other implicit conditions. Only free on an explicit call to disconnect() or free()
*/
#define REDIS_OPT_NOAUTOFREE 0x04
typedef
struct
{
/*
* the type of connection to use. This also indicates which
...
...
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