diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-05 04:12:01 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-05 04:12:01 +0400 |
| commit | d2c13039ede9e50cf2aaf55651f66d4b730089af (patch) | |
| tree | 2a5219dd51dffd273455652dbbd84d868d43361e /intern/guardedalloc/MEM_guardedalloc.h | |
| parent | 7afc0ca6009b063e6f2fd4123d8b86da174db379 (diff) | |
| parent | cb89decfdcf5e6b2f26376d416633f4ccf0c532d (diff) | |
svn merge -r 16320:16369 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern/guardedalloc/MEM_guardedalloc.h')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index d004e7952cc..1d4c753802b 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -58,8 +58,8 @@ #ifndef MEM_MALLOCN_H #define MEM_MALLOCN_H -/* Needed for FILE* */ -#include "stdio.h" +#include "stdio.h" /* needed for FILE* */ +#include "BLO_sys_types.h" /* needed for uintptr_t */ #ifdef __cplusplus extern "C" { @@ -123,6 +123,12 @@ extern "C" { /** Attempt to enforce OSX (or other OS's) to have malloc and stack nonzero */ void MEM_set_memory_debug(void); + /* Memory usage stats + * - MEM_get_memory_in_use is all memory + * - MEM_get_mapped_memory_in_use is a subset of all memory */ + uintptr_t MEM_get_memory_in_use(void); + uintptr_t MEM_get_mapped_memory_in_use(void); + int MEM_get_memory_blocks_in_use(void); #ifdef __cplusplus } |