From c86c9297dc91056fb8f17e3770e259853b60f310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 14 Oct 2014 16:11:20 +0200 Subject: Fix inconsistent types in guardealloc This basically fixes mix of size_t and uintptr_t usages which might be different size. --- intern/guardedalloc/MEM_guardedalloc.h | 4 ++-- intern/guardedalloc/intern/mallocn.c | 6 +++--- intern/guardedalloc/intern/mallocn_guarded_impl.c | 8 ++++---- intern/guardedalloc/intern/mallocn_intern.h | 12 ++++++------ intern/guardedalloc/intern/mallocn_lockfree_impl.c | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'intern') diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 3b56362e3d6..f0a69f99385 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -165,9 +165,9 @@ extern "C" { * Memory usage stats * - MEM_get_memory_in_use is all memory * - MEM_get_mapped_memory_in_use is a subset of all memory */ - extern uintptr_t (*MEM_get_memory_in_use)(void); + extern size_t (*MEM_get_memory_in_use)(void); /** Get mapped memory usage. */ - extern uintptr_t (*MEM_get_mapped_memory_in_use)(void); + extern size_t (*MEM_get_mapped_memory_in_use)(void); /** Get amount of memory blocks in use. */ extern unsigned int (*MEM_get_memory_blocks_in_use)(void); diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index be0a8aadf84..a379837c552 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -53,11 +53,11 @@ void (*MEM_set_error_callback)(void (*func)(const char *)) = MEM_lockfree_set_er bool (*MEM_check_memory_integrity)(void) = MEM_lockfree_check_memory_integrity; void (*MEM_set_lock_callback)(void (*lock)(void), void (*unlock)(void)) = MEM_lockfree_set_lock_callback; void (*MEM_set_memory_debug)(void) = MEM_lockfree_set_memory_debug; -uintptr_t (*MEM_get_memory_in_use)(void) = MEM_lockfree_get_memory_in_use; -uintptr_t (*MEM_get_mapped_memory_in_use)(void) = MEM_lockfree_get_mapped_memory_in_use; +size_t (*MEM_get_memory_in_use)(void) = MEM_lockfree_get_memory_in_use; +size_t (*MEM_get_mapped_memory_in_use)(void) = MEM_lockfree_get_mapped_memory_in_use; unsigned int (*MEM_get_memory_blocks_in_use)(void) = MEM_lockfree_get_memory_blocks_in_use; void (*MEM_reset_peak_memory)(void) = MEM_lockfree_reset_peak_memory; -uintptr_t (*MEM_get_peak_memory)(void) = MEM_lockfree_get_peak_memory; +size_t (*MEM_get_peak_memory)(void) = MEM_lockfree_get_peak_memory; #ifndef NDEBUG const char *(*MEM_name_ptr)(void *vmemh) = MEM_lockfree_name_ptr; diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index 10781a9cc54..ecc54882447 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -1151,9 +1151,9 @@ void MEM_guarded_reset_peak_memory(void) 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 +1162,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; diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index 7da74f7cc4c..6cab1f01b70 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -139,11 +139,11 @@ void MEM_lockfree_set_error_callback(void (*func)(const char *)); bool MEM_lockfree_check_memory_integrity(void); void MEM_lockfree_set_lock_callback(void (*lock)(void), void (*unlock)(void)); void MEM_lockfree_set_memory_debug(void); -uintptr_t MEM_lockfree_get_memory_in_use(void); -uintptr_t MEM_lockfree_get_mapped_memory_in_use(void); +size_t MEM_lockfree_get_memory_in_use(void); +size_t MEM_lockfree_get_mapped_memory_in_use(void); unsigned int MEM_lockfree_get_memory_blocks_in_use(void); void MEM_lockfree_reset_peak_memory(void); -uintptr_t MEM_lockfree_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; +size_t MEM_lockfree_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; #ifndef NDEBUG const char *MEM_lockfree_name_ptr(void *vmemh); #endif @@ -166,11 +166,11 @@ void MEM_guarded_set_error_callback(void (*func)(const char *)); bool MEM_guarded_check_memory_integrity(void); void MEM_guarded_set_lock_callback(void (*lock)(void), void (*unlock)(void)); void MEM_guarded_set_memory_debug(void); -uintptr_t MEM_guarded_get_memory_in_use(void); -uintptr_t MEM_guarded_get_mapped_memory_in_use(void); +size_t MEM_guarded_get_memory_in_use(void); +size_t MEM_guarded_get_mapped_memory_in_use(void); unsigned int MEM_guarded_get_memory_blocks_in_use(void); void MEM_guarded_reset_peak_memory(void); -uintptr_t MEM_guarded_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; +size_t MEM_guarded_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; #ifndef NDEBUG const char *MEM_guarded_name_ptr(void *vmemh); #endif diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c index 2041a1c132a..eaa60202f3c 100644 --- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c +++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c @@ -452,12 +452,12 @@ void MEM_lockfree_set_memory_debug(void) malloc_debug_memset = true; } -uintptr_t MEM_lockfree_get_memory_in_use(void) +size_t MEM_lockfree_get_memory_in_use(void) { return mem_in_use; } -uintptr_t MEM_lockfree_get_mapped_memory_in_use(void) +size_t MEM_lockfree_get_mapped_memory_in_use(void) { return mmap_in_use; } @@ -473,7 +473,7 @@ void MEM_lockfree_reset_peak_memory(void) peak_mem = 0; } -uintptr_t MEM_lockfree_get_peak_memory(void) +size_t MEM_lockfree_get_peak_memory(void) { return peak_mem; } -- cgit v1.2.3