Now maxmemory, VM, and everything else uses the fast RSS memory used estimation inste...

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index a401a5b9dd2d5e59c525796c3be63fe22aeeb950..b8e24ab6d701181345fe68a02b4337630fd5daa9 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -885,16 +885,16 @@ int rdbLoad(char *filename) {
 
         /* Flush data on disk once 32 MB of additional RAM are used... */
         force_swapout = 0;
 
         /* Flush data on disk once 32 MB of additional RAM are used... */
         force_swapout = 0;

-        if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32)
+        if ((redisEstimateRSS() - server.vm_max_memory) > 1024*1024*32)

             force_swapout = 1;
 
         /* If we have still some hope of having some value fitting memory
          * then we try random sampling. */
         if (!swap_all_values && server.vm_enabled && force_swapout) {
             force_swapout = 1;
 
         /* If we have still some hope of having some value fitting memory
          * then we try random sampling. */
         if (!swap_all_values && server.vm_enabled && force_swapout) {

-            while (zmalloc_used_memory() > server.vm_max_memory) {
+            while (redisEstimateRSS() > server.vm_max_memory) {

                 if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
             }
                 if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
             }

-            if (zmalloc_used_memory() > server.vm_max_memory)
+            if (redisEstimateRSS() > server.vm_max_memory)

                 swap_all_values = 1; /* We are already using too much mem */
         }
     }
                 swap_all_values = 1; /* We are already using too much mem */
         }
     }