Merge branch 'issue327' into unstable

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index bd5d77ce3c75cbbdb06e84d858ff321afecb795b..b4acd6eaacd6752de9c79becc3c1f4ad5e62f116 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1801,18 +1801,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;
@@ -1827,7 +1819,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);
@@ -1842,7 +1833,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;
 
@@ -1944,12 +1934,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;
 }