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
8b7c3455
Commit
8b7c3455
authored
Feb 06, 2012
by
antirez
Browse files
freeMemoryIfNeeded() minor refactoring
parent
c1ef6ffe
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/networking.c
View file @
8b7c3455
...
...
@@ -1315,3 +1315,24 @@ void asyncCloseClientOnOutputBufferLimitReached(redisClient *c) {
sdsfree
(
client
);
}
}
/* Helper function used by freeMemoryIfNeeded() in order to flush slaves
* output buffers without returning control to the event loop. */
void
flushSlavesOutputBuffers
(
void
)
{
listIter
li
;
listNode
*
ln
;
listRewind
(
server
.
slaves
,
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
redisClient
*
slave
=
listNodeValue
(
ln
);
int
events
;
events
=
aeGetFileEvents
(
server
.
el
,
slave
->
fd
);
if
(
events
&
AE_WRITABLE
&&
slave
->
replstate
==
REDIS_REPL_ONLINE
&&
listLength
(
slave
->
reply
))
{
sendReplyToClient
(
server
.
el
,
slave
->
fd
,
slave
,
0
);
}
}
}
src/redis.c
View file @
8b7c3455
...
...
@@ -1832,7 +1832,6 @@ int freeMemoryIfNeeded(void) {
/* Compute how much memory we need to free. */
mem_tofree
=
mem_used
-
server
.
maxmemory
;
printf
(
"USED: %zu, TOFREE: %zu
\n
"
,
mem_used
,
mem_tofree
);
mem_freed
=
0
;
while
(
mem_freed
<
mem_tofree
)
{
int
j
,
k
,
keys_freed
=
0
;
...
...
@@ -1923,7 +1922,6 @@ int freeMemoryIfNeeded(void) {
delta
=
(
long
long
)
zmalloc_used_memory
();
dbDelete
(
db
,
keyobj
);
delta
-=
(
long
long
)
zmalloc_used_memory
();
// printf("%lld\n",delta);
mem_freed
+=
delta
;
server
.
stat_evictedkeys
++
;
decrRefCount
(
keyobj
);
...
...
@@ -1933,27 +1931,7 @@ int freeMemoryIfNeeded(void) {
* start spending so much time here that is impossible to
* deliver data to the slaves fast enough, so we force the
* transmission here inside the loop. */
if
(
slaves
)
{
listIter
li
;
listNode
*
ln
;
listRewind
(
server
.
slaves
,
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
redisClient
*
slave
=
listNodeValue
(
ln
);
int
events
;
events
=
aeGetFileEvents
(
server
.
el
,
slave
->
fd
);
printf
(
"EVENTS: %d
\n
"
,
events
);
if
(
events
&
AE_WRITABLE
&&
slave
->
replstate
==
REDIS_REPL_ONLINE
&&
listLength
(
slave
->
reply
))
{
printf
(
"SLAVE %d -> %d
\n
"
,
slave
->
fd
,
(
int
)
listLength
(
slave
->
reply
));
sendReplyToClient
(
server
.
el
,
slave
->
fd
,
slave
,
0
);
}
}
}
if
(
slaves
)
flushSlavesOutputBuffers
();
}
}
if
(
!
keys_freed
)
return
REDIS_ERR
;
/* nothing to free... */
...
...
src/redis.h
View file @
8b7c3455
...
...
@@ -820,6 +820,7 @@ void freeClientsInAsyncFreeQueue(void);
void
asyncCloseClientOnOutputBufferLimitReached
(
redisClient
*
c
);
int
getClientLimitClassByName
(
char
*
name
);
char
*
getClientLimitClassName
(
int
class
);
void
flushSlavesOutputBuffers
(
void
);
#ifdef __GNUC__
void
addReplyErrorFormat
(
redisClient
*
c
,
const
char
*
fmt
,
...)
...
...
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