Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2010-05-04 16:31:24 +0400
committerJoseph Eagar <joeedh@gmail.com>2010-05-04 16:31:24 +0400
commita7cbd5008e830224e73e2e55f89d0783ded422e5 (patch)
tree63f8d80c1db62e0a8f71db6d89de9d95e4b91fa0 /intern/guardedalloc/MEM_guardedalloc.h
parentcef3e3099a8d808474237e26cf373b3943897cb3 (diff)
merging revisions 28564-28569 from render branch into trunk
Diffstat (limited to 'intern/guardedalloc/MEM_guardedalloc.h')
-rw-r--r--intern/guardedalloc/MEM_guardedalloc.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 705f099ab63..c51e96f04b5 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -144,6 +144,12 @@ extern "C" {
uintptr_t MEM_get_mapped_memory_in_use(void);
int MEM_get_memory_blocks_in_use(void);
+ /*reset the peak memory statistic to zero*/
+ void MEM_reset_peak_memory(void);
+
+ /*get the peak memory usage in bytes, including mmap allocations*/
+ uintptr_t MEM_get_peak_memory(void);
+
#ifdef __cplusplus
}
#endif