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
9dff5105
Commit
9dff5105
authored
Apr 30, 2013
by
Allen.Dou
Browse files
Make KeepAlive optional
Make Connection KeepAlive being optional instead of default.
parent
8d5bc445
Changes
4
Hide whitespace changes
Inline
Side-by-side
hiredis.c
View file @
9dff5105
...
...
@@ -1092,6 +1092,13 @@ int redisSetTimeout(redisContext *c, struct timeval tv) {
return
REDIS_ERR
;
}
/* Enable connection KeepAlive. */
int
redisEnableKeepAlive
(
redisContext
*
c
)
{
if
(
redisKeepAlive
(
c
,
REDIS_KEEPALIVE_INTERVAL
)
!=
REDIS_OK
)
return
REDIS_ERR
;
return
REDIS_OK
;
}
/* Use this function to handle a read event on the descriptor. It will try
* and read some bytes from the socket and feed them to the reply parser.
*
...
...
hiredis.h
View file @
9dff5105
...
...
@@ -179,6 +179,7 @@ redisContext *redisConnectUnix(const char *path);
redisContext
*
redisConnectUnixWithTimeout
(
const
char
*
path
,
struct
timeval
tv
);
redisContext
*
redisConnectUnixNonBlock
(
const
char
*
path
);
int
redisSetTimeout
(
redisContext
*
c
,
struct
timeval
tv
);
int
redisEnableKeepAlive
(
redisContext
*
c
);
void
redisFree
(
redisContext
*
c
);
int
redisBufferRead
(
redisContext
*
c
);
int
redisBufferWrite
(
redisContext
*
c
,
int
*
done
);
...
...
net.c
View file @
9dff5105
...
...
@@ -113,9 +113,10 @@ static int redisSetBlocking(redisContext *c, int fd, int blocking) {
return
REDIS_OK
;
}
static
int
redisKeepAlive
(
redisContext
*
c
,
int
fd
,
int
interval
)
{
int
redisKeepAlive
(
redisContext
*
c
,
int
interval
)
{
int
val
=
1
;
int
fd
=
c
->
fd
;
if
(
setsockopt
(
fd
,
SOL_SOCKET
,
SO_KEEPALIVE
,
&
val
,
sizeof
(
val
))
==
-
1
){
__redisSetError
(
c
,
REDIS_ERR_OTHER
,
strerror
(
errno
));
return
REDIS_ERR
;
...
...
@@ -143,8 +144,6 @@ static int redisKeepAlive(redisContext *c,int fd,int interval) {
return
REDIS_OK
;
}
static
int
redisSetTcpNoDelay
(
redisContext
*
c
,
int
fd
)
{
int
yes
=
1
;
if
(
setsockopt
(
fd
,
IPPROTO_TCP
,
TCP_NODELAY
,
&
yes
,
sizeof
(
yes
))
==
-
1
)
{
...
...
@@ -273,8 +272,6 @@ int redisContextConnectTcp(redisContext *c, const char *addr, int port, struct t
goto
error
;
if
(
redisSetTcpNoDelay
(
c
,
s
)
!=
REDIS_OK
)
goto
error
;
if
(
redisKeepAlive
(
c
,
s
,
REDIS_KEEPALIVE_INTERVAL
)
!=
REDIS_OK
)
goto
error
;
c
->
fd
=
s
;
c
->
flags
|=
REDIS_CONNECTED
;
...
...
net.h
View file @
9dff5105
...
...
@@ -43,5 +43,6 @@ int redisCheckSocketError(redisContext *c, int fd);
int
redisContextSetTimeout
(
redisContext
*
c
,
struct
timeval
tv
);
int
redisContextConnectTcp
(
redisContext
*
c
,
const
char
*
addr
,
int
port
,
struct
timeval
*
timeout
);
int
redisContextConnectUnix
(
redisContext
*
c
,
const
char
*
path
,
struct
timeval
*
timeout
);
int
redisKeepAlive
(
redisContext
*
c
,
int
interval
);
#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