From 9fc2c3732878288bb3a69e163a702d6e46ad95ef Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 19 Feb 2015 13:14:06 +0500 Subject: Guardedalloc: Reset peak memory should set peak to currently allocated memory Otherwise statistics could be really funny looking. --- intern/guardedalloc/intern/mallocn_guarded_impl.c | 2 +- intern/guardedalloc/intern/mallocn_lockfree_impl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/guardedalloc') diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index 9a503422282..bdcace243d9 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -1148,7 +1148,7 @@ 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(); } diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c index b5f3d1b15dc..a80d67c3e80 100644 --- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c +++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c @@ -478,7 +478,7 @@ unsigned int MEM_lockfree_get_memory_blocks_in_use(void) /* dummy */ void MEM_lockfree_reset_peak_memory(void) { - peak_mem = 0; + peak_mem = mem_in_use; } size_t MEM_lockfree_get_peak_memory(void) -- cgit v1.2.3