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
b129c6df
Commit
b129c6df
authored
Feb 08, 2012
by
antirez
Browse files
debugging messages removed from freeMemoryIfNeeded()
parent
609baba8
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis.c
View file @
b129c6df
...
@@ -1801,18 +1801,10 @@ void monitorCommand(redisClient *c) {
...
@@ -1801,18 +1801,10 @@ void monitorCommand(redisClient *c) {
int freeMemoryIfNeeded(void) {
int freeMemoryIfNeeded(void) {
size_t mem_used, mem_tofree, mem_freed;
size_t mem_used, mem_tofree, mem_freed;
int slaves = listLength(server.slaves);
int slaves = listLength(server.slaves);
static
time_t
xt
;
int
debug
=
0
;
if
(
xt
!=
time
(
NULL
))
{
debug
=
1
;
xt
=
time
(
NULL
);
}
/* Remove the size of slaves output buffers and AOF buffer from the
/* Remove the size of slaves output buffers and AOF buffer from the
* count of used memory. */
* count of used memory. */
mem_used = zmalloc_used_memory();
mem_used = zmalloc_used_memory();
if
(
debug
)
printf
(
"used_full: %zu
\n
"
,
mem_used
);
if (slaves) {
if (slaves) {
listIter li;
listIter li;
listNode *ln;
listNode *ln;
...
@@ -1827,7 +1819,6 @@ int freeMemoryIfNeeded(void) {
...
@@ -1827,7 +1819,6 @@ int freeMemoryIfNeeded(void) {
mem_used -= obuf_bytes;
mem_used -= obuf_bytes;
}
}
}
}
if
(
debug
)
printf
(
"used_nosl: %zu
\n
"
,
mem_used
);
if (server.aof_state != REDIS_AOF_OFF) {
if (server.aof_state != REDIS_AOF_OFF) {
mem_used -= sdslen(server.aof_buf);
mem_used -= sdslen(server.aof_buf);
mem_used -= sdslen(server.aof_rewrite_buf);
mem_used -= sdslen(server.aof_rewrite_buf);
...
@@ -1842,7 +1833,6 @@ int freeMemoryIfNeeded(void) {
...
@@ -1842,7 +1833,6 @@ int freeMemoryIfNeeded(void) {
/* Compute how much memory we need to free. */
/* Compute how much memory we need to free. */
mem_tofree = mem_used - server.maxmemory;
mem_tofree = mem_used - server.maxmemory;
mem_freed = 0;
mem_freed = 0;
if
(
debug
)
printf
(
"tofree: %zu
\n
"
,
mem_tofree
);
while (mem_freed < mem_tofree) {
while (mem_freed < mem_tofree) {
int j, k, keys_freed = 0;
int j, k, keys_freed = 0;
...
@@ -1944,12 +1934,8 @@ int freeMemoryIfNeeded(void) {
...
@@ -1944,12 +1934,8 @@ int freeMemoryIfNeeded(void) {
if (slaves) flushSlavesOutputBuffers();
if (slaves) flushSlavesOutputBuffers();
}
}
}
}
if
(
!
keys_freed
)
{
if (!keys_freed) return REDIS_ERR; /* nothing to free... */
if
(
debug
)
printf
(
"-freed: %zu
\n\n
"
,
mem_freed
);
return
REDIS_ERR
;
/* nothing to free... */
}
}
}
if
(
debug
)
printf
(
"+freed: %zu
\n\n
"
,
mem_freed
);
return REDIS_OK;
return REDIS_OK;
}
}
...
...
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