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
redis
Commits
03cfc8bf
Unverified
Commit
03cfc8bf
authored
Dec 05, 2017
by
Salvatore Sanfilippo
Committed by
GitHub
Dec 05, 2017
Browse files
Merge pull request #4497 from soloestoy/optimize-unlink-client
networking: optimize unlinkClient() in freeClient()
parents
c56fbb24
43be9676
Changes
3
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
03cfc8bf
...
...
@@ -136,7 +136,12 @@ client *createClient(int fd) {
c
->
peerid
=
NULL
;
listSetFreeMethod
(
c
->
pubsub_patterns
,
decrRefCountVoid
);
listSetMatchMethod
(
c
->
pubsub_patterns
,
listMatchObjects
);
if
(
fd
!=
-
1
)
listAddNodeTail
(
server
.
clients
,
c
);
if
(
fd
!=
-
1
)
{
listAddNodeTail
(
server
.
clients
,
c
);
c
->
client_list_node
=
listLast
(
server
.
clients
);
}
else
{
c
->
client_list_node
=
NULL
;
}
initClientMultiState
(
c
);
return
c
;
}
...
...
@@ -744,9 +749,10 @@ void unlinkClient(client *c) {
* fd is already set to -1. */
if
(
c
->
fd
!=
-
1
)
{
/* Remove from the list of active clients. */
ln
=
listSearchKey
(
server
.
clients
,
c
);
serverAssert
(
ln
!=
NULL
);
listDelNode
(
server
.
clients
,
ln
);
if
(
c
->
client_list_node
)
{
listDelNode
(
server
.
clients
,
c
->
client_list_node
);
c
->
client_list_node
=
NULL
;
}
/* Unregister async I/O handlers and close the socket. */
aeDeleteFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
);
...
...
src/replication.c
View file @
03cfc8bf
...
...
@@ -2206,6 +2206,7 @@ void replicationResurrectCachedMaster(int newfd) {
/* Re-add to the list of clients. */
listAddNodeTail
(
server
.
clients
,
server
.
master
);
server
.
master
->
client_list_node
=
listLast
(
server
.
clients
);
if
(
aeCreateFileEvent
(
server
.
el
,
newfd
,
AE_READABLE
,
readQueryFromClient
,
server
.
master
))
{
serverLog
(
LL_WARNING
,
"Error resurrecting the cached master, impossible to add the readable handler: %s"
,
strerror
(
errno
));
...
...
src/server.h
View file @
03cfc8bf
...
...
@@ -733,6 +733,7 @@ typedef struct client {
dict
*
pubsub_channels
;
/* channels a client is interested in (SUBSCRIBE) */
list
*
pubsub_patterns
;
/* patterns a client is interested in (SUBSCRIBE) */
sds
peerid
;
/* Cached peer ID. */
listNode
*
client_list_node
;
/* list node in client list */
/* Response buffer */
int
bufpos
;
...
...
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