fix over-inflation of total_malloced

mem_alloced was getting increased every time a page was assigned out of either
malloc or the global page pool. This means total_malloced will inflate forever
as pages are reused, and once limit_maxbytes is surpassed it will stop
attempting to malloc more memory.

The result is we would stop malloc'ing new memory too early if page reclaim
happens before the whole thing fills. The test already caused this condition,
so adding the extra checks was trivial.

1 files changed, 1 insertions, 1 deletions

diff --git a/slabs.c b/slabs.c
index 770480e..31e85f6 100644
--- a/slabs.c
+++ b/slabs.c
@@ -232,7 +232,6 @@ static int do_slabs_newslab(const unsigned int id) {
     split_slab_page_into_freelist(ptr, id);
 
     p->slab_list[p->slabs++] = ptr;
-    mem_malloced += len;
     MEMCACHED_SLABS_SLABCLASS_ALLOCATE(id);
 
     return 1;
@@ -430,6 +429,7 @@ static void *memory_allocate(size_t size) {
             mem_avail = 0;
         }
     }
+    mem_malloced += size;
 
     return ret;
 }