diff options
Diffstat (limited to 'intern/guardedalloc/intern/mallocn_guarded_impl.c')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_guarded_impl.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index 10781a9cc54..1933e9d3ee3 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -22,6 +22,7 @@ * * Contributor(s): Brecht Van Lommel * Campbell Barton + * Sergey Sharybin * * ***** END GPL LICENSE BLOCK ***** */ @@ -710,10 +711,12 @@ void MEM_guarded_printmemlist_stats(void) totpb++; pb++; - if (!membl->mmap) { +#ifdef USE_MALLOC_USABLE_SIZE + if (!membl->mmap && membl->alignment == 0) { mem_in_use_slop += (sizeof(MemHead) + sizeof(MemTail) + malloc_usable_size((void *)membl)) - membl->len; } +#endif if (membl->next) membl = MEMNEXT(membl->next); @@ -1147,13 +1150,13 @@ size_t MEM_guarded_get_peak_memory(void) void MEM_guarded_reset_peak_memory(void) { mem_lock_thread(); - peak_mem = 0; + peak_mem = mem_in_use; mem_unlock_thread(); } -uintptr_t MEM_guarded_get_memory_in_use(void) +size_t MEM_guarded_get_memory_in_use(void) { - uintptr_t _mem_in_use; + size_t _mem_in_use; mem_lock_thread(); _mem_in_use = mem_in_use; @@ -1162,9 +1165,9 @@ uintptr_t MEM_guarded_get_memory_in_use(void) return _mem_in_use; } -uintptr_t MEM_guarded_get_mapped_memory_in_use(void) +size_t MEM_guarded_get_mapped_memory_in_use(void) { - uintptr_t _mmap_in_use; + size_t _mmap_in_use; mem_lock_thread(); _mmap_in_use = mmap_in_use; |