Fixed memory human style memory reporting, removed server.usedmemory, now zmalloc_use...

diff --git a/TODO b/TODO
index 015a01a1ac237a3770fad484f1cf658a77e4ea41..0771cafe9f5a1ffc23b24748c3c4a5bbb901a5e7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -14,6 +14,8 @@ Virtual Memory sub-TODO:
 * Divide swappability of objects by refcount
 * it should be possible to give the vm-max-memory option in megabyte, gigabyte, ..., just using 2GB, 100MB, and so forth.
 * Try to understand what can be moved into I/O threads that currently is instead handled by the main thread. For instance swapping file table scannig to find contiguous page could be a potential candidate (but I'm not convinced it's a good idea, better to improve the algorithm, for instance double the fast forward at every step?).
 * Divide swappability of objects by refcount
 * it should be possible to give the vm-max-memory option in megabyte, gigabyte, ..., just using 2GB, 100MB, and so forth.
 * Try to understand what can be moved into I/O threads that currently is instead handled by the main thread. For instance swapping file table scannig to find contiguous page could be a potential candidate (but I'm not convinced it's a good idea, better to improve the algorithm, for instance double the fast forward at every step?).

+* EXISTS should avoid loading the object if possible without too make the code too specialized.
+* vm-min-age <seconds> option

 
 * Hashes (HSET, HGET, HDEL, HEXISTS, HLEN, ...).
 
 
 * Hashes (HSET, HGET, HDEL, HEXISTS, HLEN, ...).
 

diff --git a/redis.c b/redis.c
index c187b266f7ffa2458c3a574b43db261e2ae671a9..21c547c0560e908898772940948ed9b85c87c7f4 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -336,7 +336,6 @@ struct redisServer {
     int cronloops;              /* number of times the cron function run */
     list *objfreelist;          /* A list of freed objects to avoid malloc() */
     time_t lastsave;            /* Unix time of last save succeeede */
     int cronloops;              /* number of times the cron function run */
     list *objfreelist;          /* A list of freed objects to avoid malloc() */
     time_t lastsave;            /* Unix time of last save succeeede */

-    size_t usedmemory;             /* Used memory in megabytes */

     /* Fields used only for stats */
     time_t stat_starttime;         /* server start time */
     long long stat_numcommands;    /* number of processed commands */
     /* Fields used only for stats */
     time_t stat_starttime;         /* server start time */
     long long stat_numcommands;    /* number of processed commands */


@@ -1165,9 +1164,6 @@ static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientD
      * To access a global var is faster than calling time(NULL) */
     server.unixtime = time(NULL);
 
      * To access a global var is faster than calling time(NULL) */
     server.unixtime = time(NULL);
 

-    /* Update the global state with the amount of used memory */
-    server.usedmemory = zmalloc_used_memory();
-

     /* Show some info about non-empty databases */
     for (j = 0; j < server.dbnum; j++) {
         long long size, used, vkeys;
     /* Show some info about non-empty databases */
     for (j = 0; j < server.dbnum; j++) {
         long long size, used, vkeys;


@@ -1194,7 +1190,7 @@ static int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientD
         redisLog(REDIS_VERBOSE,"%d clients connected (%d slaves), %zu bytes in use, %d shared objects",
             listLength(server.clients)-listLength(server.slaves),
             listLength(server.slaves),
         redisLog(REDIS_VERBOSE,"%d clients connected (%d slaves), %zu bytes in use, %d shared objects",
             listLength(server.clients)-listLength(server.slaves),
             listLength(server.slaves),

-            server.usedmemory,
+            zmalloc_used_memory(),

             dictSize(server.sharingpool));
     }
 
             dictSize(server.sharingpool));
     }
 


@@ -1437,7 +1433,6 @@ static void initServer() {
     server.bgrewritebuf = sdsempty();
     server.lastsave = time(NULL);
     server.dirty = 0;
     server.bgrewritebuf = sdsempty();
     server.lastsave = time(NULL);
     server.dirty = 0;

-    server.usedmemory = 0;

     server.stat_numcommands = 0;
     server.stat_numconnections = 0;
     server.stat_starttime = time(NULL);
     server.stat_numcommands = 0;
     server.stat_numconnections = 0;
     server.stat_starttime = time(NULL);


@@ -5581,7 +5576,7 @@ static void bytesToHuman(char *s, unsigned long long n) {
         sprintf(s,"%.2fM",d);
     } else if (n < (1024LL*1024*1024*1024)) {
         d = (double)n/(1024LL*1024*1024);
         sprintf(s,"%.2fM",d);
     } else if (n < (1024LL*1024*1024*1024)) {
         d = (double)n/(1024LL*1024*1024);

-        sprintf(s,"%.2fM",d);
+        sprintf(s,"%.2fG",d);

     }
 }
 
     }
 }
 


@@ -5594,7 +5589,7 @@ static sds genRedisInfoString(void) {
     int j;
     char hmem[64];
   
     int j;
     char hmem[64];
   

-    bytesToHuman(hmem,server.usedmemory);
+    bytesToHuman(hmem,zmalloc_used_memory());

     info = sdscatprintf(sdsempty(),
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"
     info = sdscatprintf(sdsempty(),
         "redis_version:%s\r\n"
         "arch_bits:%s\r\n"


@@ -5624,7 +5619,7 @@ static sds genRedisInfoString(void) {
         listLength(server.clients)-listLength(server.slaves),
         listLength(server.slaves),
         server.blockedclients,
         listLength(server.clients)-listLength(server.slaves),
         listLength(server.slaves),
         server.blockedclients,

-        server.usedmemory,
+        zmalloc_used_memory(),

         hmem,
         server.dirty,
         server.bgsavechildpid != -1,
         hmem,
         server.dirty,
         server.bgsavechildpid != -1,


@@ -7396,6 +7391,9 @@ static int vmSwapOneObject(int usethreads) {
 
     for (j = 0; j < server.dbnum; j++) {
         redisDb *db = server.db+j;
 
     for (j = 0; j < server.dbnum; j++) {
         redisDb *db = server.db+j;

+        /* Why maxtries is set to 100?
+         * Because this way (usually) we'll find 1 object even if just 1% - 2%
+         * are swappable objects */

         int maxtries = 100;
 
         if (dictSize(db->dict) == 0) continue;
         int maxtries = 100;
 
         if (dictSize(db->dict) == 0) continue;