diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-01 16:52:56 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 16:52:56 -0300 |
| commit | 083705c45dc8613858bf39a2e6a467b81990284e (patch) | |
| tree | 0b6e73ddb6947bb6cf31f35d3bff8dfc6af983bc /core/os/memory.h | |
| parent | daad16b7c7a10f0f1ede92899573e9e354c9d2cd (diff) | |
| parent | 02607b3103d216dd49ad6fc9ded51773ddb47afd (diff) | |
Merge pull request #9828 from RandomShaper/improve-mem-stats
Improve reliability of memory stats
Diffstat (limited to 'core/os/memory.h')
| -rw-r--r-- | core/os/memory.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/os/memory.h b/core/os/memory.h index b3eb599955..e1d7138ad5 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -45,20 +45,20 @@ class Memory { Memory(); #ifdef DEBUG_ENABLED - static size_t mem_usage; - static size_t max_usage; + static uint64_t mem_usage; + static uint64_t max_usage; #endif - static size_t alloc_count; + static uint64_t alloc_count; public: static void *alloc_static(size_t p_bytes, bool p_pad_align = false); static void *realloc_static(void *p_memory, size_t p_bytes, bool p_pad_align = false); static void free_static(void *p_ptr, bool p_pad_align = false); - static size_t get_mem_available(); - static size_t get_mem_usage(); - static size_t get_mem_max_usage(); + static uint64_t get_mem_available(); + static uint64_t get_mem_usage(); + static uint64_t get_mem_max_usage(); }; class DefaultAllocator { |