summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2012-02-08 00:10:20 +0100
committerantirez <antirez@gmail.com>2012-02-15 15:26:14 +0100
commitf27d38862df1acecb7681d21b007affaf78534d6 (patch)
tree728529ccc9b51e5401884953ee190d310720d16a
parent4de73b7e0f6d199406bf35456815aa7b3bc98fd8 (diff)
downloadredis-f27d38862df1acecb7681d21b007affaf78534d6.tar.gz
debugging messages removed from freeMemoryIfNeeded()
-rw-r--r--src/redis.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/redis.c b/src/redis.c
index 822f9c8a5..4f6de4ff4 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -1546,18 +1546,10 @@ void monitorCommand(redisClient *c) {
int freeMemoryIfNeeded(void) {
size_t mem_used, mem_tofree, mem_freed;
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
* count of used memory. */
mem_used = zmalloc_used_memory();
- if (debug) printf("used_full: %zu\n", mem_used);
if (slaves) {
listIter li;
listNode *ln;
@@ -1572,7 +1564,6 @@ int freeMemoryIfNeeded(void) {
mem_used -= obuf_bytes;
}
}
- if (debug) printf("used_nosl: %zu\n", mem_used);
if (server.aof_state != REDIS_AOF_OFF) {
mem_used -= sdslen(server.aof_buf);
mem_used -= sdslen(server.aof_rewrite_buf);
@@ -1587,7 +1578,6 @@ int freeMemoryIfNeeded(void) {
/* Compute how much memory we need to free. */
mem_tofree = mem_used - server.maxmemory;
mem_freed = 0;
- if (debug) printf("tofree: %zu\n", mem_tofree);
while (mem_freed < mem_tofree) {
int j, k, keys_freed = 0;
@@ -1689,12 +1679,8 @@ int freeMemoryIfNeeded(void) {
if (slaves) flushSlavesOutputBuffers();
}
}
- if (!keys_freed) {
- if (debug) printf("-freed: %zu\n\n", mem_freed);
- return REDIS_ERR; /* nothing to free... */
- }
+ if (!keys_freed) return REDIS_ERR; /* nothing to free... */
}
- if (debug) printf("+freed: %zu\n\n", mem_freed);
return REDIS_OK;
}