blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix inconsistent types in guardealloc 

This basically fixes mix of size_t and uintptr_t usages which might be different size.
This commit is contained in:
Dan Horák 2014-10-14 16:11:20 +02:00 committed by Sergey Sharybin
parent b171fd7483
commit c86c9297dc
Notes: blender-bot 2023-06-21 19:23:24 +02:00 
Referenced by issue #42183, inconsistent types in guardealloc
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/guardedalloc/MEM_guardedalloc.h
View File

@ -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);

6
intern/guardedalloc/intern/mallocn.c
View File

@ -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;

8
intern/guardedalloc/intern/mallocn_guarded_impl.c
View File

@ -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;

12
intern/guardedalloc/intern/mallocn_intern.h
View File

@ -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

6
intern/guardedalloc/intern/mallocn_lockfree_impl.c
View File

@ -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;
}