correct own recent commit, malloc_usable_size() isn't valid for mmap()'d memory.

2013-08-28 22:12:40 +00:00
parent 2f46a2cbf7
commit 1ac57ccbc8
1 changed files with 4 additions and 2 deletions
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -649,8 +649,10 @@ void MEM_printmemlist_stats(void)
 		pb++;

 #ifdef HAVE_MALLOC_H
-		mem_in_use_slop += (sizeof(MemHead) + sizeof(MemTail) +
-		                    malloc_usable_size((void *)membl)) - membl->len;
+		if (!membl->mmap) {
+			mem_in_use_slop += (sizeof(MemHead) + sizeof(MemTail) +
+			                    malloc_usable_size((void *)membl)) - membl->len;
+		}
 #endif

 		if (membl->next)