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

Cycles: Throw bad_alloc exception when custom allocators failed to allocate memory

Browse Source 
This mimics behavior of default allocators in STL and allows all the routines
to catch out-of-memory exceptions and hopefully recover from that situation/
This commit is contained in:
Sergey Sharybin 2016-04-20 15:49:52 +02:00
parent d7e4f920fd
commit e3544c9e28
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/util/util_guarded_allocator.h
View File

@ -53,19 +53,24 @@ public:
size_t size = n * sizeof(T);
util_guarded_mem_alloc(size);
(void)hint;
#ifdef WITH_BLENDER_GUARDEDALLOC
if(n == 0) {
return NULL;
}
T *mem;
#ifdef WITH_BLENDER_GUARDEDALLOC
/* C++ standard requires allocation functions to allocate memory suitably
* aligned for any standard type. This is 16 bytes for 64 bit platform as
* far as i concerned. We might over-align on 32bit here, but that should
* be all safe actually.
*/
return (T*)MEM_mallocN_aligned(size, 16, "Cycles Alloc");
mem = (T*)MEM_mallocN_aligned(size, 16, "Cycles Alloc");
#else
return (T*)malloc(size);
mem = (T*)malloc(size);
#endif
if(mem == NULL) {
throw std::bad_alloc();
}
return mem;
}
void deallocate(T *p, size_t n)
@ -97,8 +102,10 @@ public:
void construct(T *p, const T& val)
{
if(p != NULL) {
new ((T *)p) T(val);
}
}
void destroy(T *p)
{

10
intern/cycles/util/util_stack_allocator.h
View File

@ -60,11 +60,15 @@ public:
if(pointer_ + n >= SIZE) {
size_t size = n * sizeof(T);
util_guarded_mem_alloc(size);
T *mem;
#ifdef WITH_BLENDER_GUARDEDALLOC
return (T*)MEM_mallocN_aligned(size, 16, "Cycles Alloc");
mem = (T*)MEM_mallocN_aligned(size, 16, "Cycles Alloc");
#else
return (T*)malloc(size);
mem = (T*)malloc(size);
#endif
if(mem == NULL) {
throw std::bad_alloc();
}
}
T *mem = &data_[pointer_];
pointer_ += n;
@ -104,8 +108,10 @@ public:
void construct(T *p, const T& val)
{
if(p != NULL) {
new ((T *)p) T(val);
}
}
void destroy(T *p)
{

6
intern/cycles/util/util_vector.h
View File

@ -218,10 +218,16 @@ public:
protected:
inline T* mem_allocate(size_t N)
{
if(N == 0) {
return NULL;
}
T *mem = (T*)util_aligned_malloc(sizeof(T)*N, alignment);
if(mem != NULL) {
util_guarded_mem_alloc(sizeof(T)*N);
}
else {
throw std::bad_alloc();
}
return mem;
}