Fix usage discrepancies

src/memory/binned.jl

@@ -410,26 +410,14 @@ function free(ptr)
   return
 end
 
-function used_memory()
-  sz = 0
-  @lock pool_lock for (pid, pl) in enumerate(pools_used)
-    bytes = poolsize(pid)
-    sz += bytes * length(pl)
-  end
-
-  return sz
-end
+used_memory() = @lock allocated_lock mapreduce(sizeof, +, values(allocated); init=0)
 
 function cached_memory()
-  sz = 0
+  sz = @lock freed_lock mapreduce(sizeof, +, freed; init=0)
   @lock pool_lock for (pid, pl) in enumerate(pools_avail)
     bytes = poolsize(pid)
     sz += bytes * length(pl)
   end
-  @lock freed_lock for block in freed
-    sz += sizeof(block)
-  end
-
   return sz
 end
 

src/memory/simple.jl

@@ -170,6 +170,10 @@ end
 
 used_memory() = @lock allocated_lock mapreduce(sizeof, +, values(allocated); init=0)
 
-cached_memory() = @lock(pool_lock, @lock(freed_lock, mapreduce(sizeof, +, union(pool, freed); init=0)))
+function cached_memory()
+    sz = @lock freed_lock mapreduce(sizeof, +, freed; init=0)
+    sz += @lock pool_lock mapreduce(sizeof, +, pool; init=0)
+    return sz
+end
 
 end

src/memory/split.jl

@@ -424,6 +424,12 @@ end
 
 used_memory() = @lock allocated_lock mapreduce(sizeof, +, values(allocated); init=0)
 
-cached_memory() = @lock(pool_lock, @lock(freed_lock, mapreduce(sizeof, +, union(pool_small, pool_large, pool_huge, freed); init=0)))
+function cached_memory()
+    sz = @lock freed_lock mapreduce(sizeof, +, freed; init=0)
+    @lock pool_lock for pool in (pool_small, pool_large, pool_huge)
+        sz += mapreduce(sizeof, +, pool; init=0)
+    end
+    return sz
+end
 
 end