sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Guarded Alloc: use UNLIKELY for debug memset

Browse Source
This commit is contained in:
Campbell Barton 2014-04-06 12:57:20 +10:00
parent 1bd3922b3a
commit 43a201662a
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,6 +221,14 @@ static bool malloc_debug_memset = false;
/* implementation */
/* --------------------------------------------------------------------- */
#ifdef __GNUC__
# define LIKELY(x) __builtin_expect(!!(x), 1)
# define UNLIKELY(x) __builtin_expect(!!(x), 0)
#else
# define LIKELY(x) (x)
# define UNLIKELY(x) (x)
#endif
#ifdef __GNUC__
__attribute__ ((format(printf, 1, 2)))
#endif
@ -497,9 +505,9 @@ void *MEM_guarded_mallocN(size_t len, const char *str)
memh = (MemHead *)malloc(len + sizeof(MemHead) + sizeof(MemTail));
if (memh) {
if (LIKELY(memh)) {
make_memhead_header(memh, len, str);
if (malloc_debug_memset && len)
if (UNLIKELY(malloc_debug_memset && len))
memset(memh + 1, 255, len);
#ifdef DEBUG_MEMCOUNTER
@ -951,7 +959,7 @@ static void rem_memblock(MemHead *memh)
#endif
}
else {
if (malloc_debug_memset && memh->len)
if (UNLIKELY(malloc_debug_memset && memh->len))
memset(memh + 1, 255, memh->len);
free(memh);
}

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

@ -63,6 +63,14 @@ static void (*thread_unlock_callback)(void) = NULL;
#define PTR_FROM_MEMHEAD(memhead) (memhead + 1)
#define MEMHEAD_IS_MMAP(memhead) ((memhead)->len & (size_t) 1)
#ifdef __GNUC__
# define LIKELY(x) __builtin_expect(!!(x), 1)
# define UNLIKELY(x) __builtin_expect(!!(x), 0)
#else
# define LIKELY(x) (x)
# define UNLIKELY(x) (x)
#endif
#ifdef __GNUC__
__attribute__ ((format(printf, 1, 2)))
#endif
@ -126,7 +134,7 @@ void MEM_lockfree_freeN(void *vmemh)
#endif
}
else {
if (malloc_debug_memset && len) {
if (UNLIKELY(malloc_debug_memset && len)) {
memset(memh + 1, 255, len);
}
free(memh);
@ -219,7 +227,7 @@ void *MEM_lockfree_callocN(size_t len, const char *str)
memh = (MemHead *)calloc(1, len + sizeof(MemHead));
if (memh) {
if (LIKELY(memh)) {
memh->len = len;
atomic_add_u(&totblock, 1);
atomic_add_z(&mem_in_use, len);
@ -242,8 +250,8 @@ void *MEM_lockfree_mallocN(size_t len, const char *str)
memh = (MemHead *)malloc(len + sizeof(MemHead));
if (memh) {
if (malloc_debug_memset && len) {
if (LIKELY(memh)) {
if (UNLIKELY(malloc_debug_memset && len)) {
memset(memh + 1, 255, len);
}