bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

assert in debug builds if MEM_ alloc's are called in openmp threads.

Browse Source 
note: the caller can do locking to prevent errors - but this isn't being done in blender yet, so this prevents accidental allocs in openmp for now.
This commit is contained in:
Campbell Barton 2012-12-12 04:41:23 +00:00
parent c40030a36c
commit 21a2660290
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,15 @@ typedef struct MemHead {
#endif #endif
} MemHead; } MemHead;
/* for openmp threading asserts, saves time troubleshooting
* we may need to extend this if blender code starts using MEM_
* functions inside OpenMP correctly with omp_set_lock() */
#if defined(_OPENMP) && defined(DEBUG)
# include <assert.h>
# include <omp.h>
# define DEBUG_OMP_MALLOC
#endif
typedef struct MemTail { typedef struct MemTail {
int tag3, pad; int tag3, pad;
} MemTail; } MemTail;
@ -194,6 +203,10 @@ static void print_error(const char *str, ...)
static void mem_lock_thread(void) static void mem_lock_thread(void)
{ {
#ifdef DEBUG_OMP_MALLOC
assert(omp_in_parallel() == 0);
#endif
if (thread_lock_callback) if (thread_lock_callback)
thread_lock_callback(); thread_lock_callback();
} }
@ -214,8 +227,7 @@ int MEM_check_memory_integrity(void)
err_val = check_memlist(listend); err_val = check_memlist(listend);
if (err_val == NULL) return 0; return (err_val != NULL);
return 1;
} }