diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /intern/cycles/util/util_guarded_allocator.h | |
parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
parent | de80e687689032cb85179a1f7e89750573631d5d (diff) |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'intern/cycles/util/util_guarded_allocator.h')
-rw-r--r-- | intern/cycles/util/util_guarded_allocator.h | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h new file mode 100644 index 00000000000..2df717253e3 --- /dev/null +++ b/intern/cycles/util/util_guarded_allocator.h @@ -0,0 +1,86 @@ +/* + * Copyright 2011-2015 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __UTIL_GUARDED_ALLOCATOR_H__ +#define __UTIL_GUARDED_ALLOCATOR_H__ + +/* Define this in order to use Blender's guarded allocator to keep + * track of allocated buffers, their sizes and peak memory usage. + * + * This is usually a bad level call, but it's really handy to keep + * track of overall peak memory consumption during the scene + * synchronization step. + */ +#undef WITH_BLENDER_GUARDEDALLOC + +#include <memory> + +#include "util_types.h" + +#ifdef WITH_BLENDER_GUARDEDALLOC +# include "../../guardedalloc/MEM_guardedalloc.h" +#endif + +CCL_NAMESPACE_BEGIN + +/* Internal use only. */ +void util_guarded_mem_alloc(size_t n); +void util_guarded_mem_free(size_t n); + +/* Guarded allocator for the use with STL. */ +template <typename T> +class GuardedAllocator : public std::allocator<T> { +public: + template<typename _Tp1> + struct rebind { + typedef GuardedAllocator<_Tp1> other; + }; + + T *allocate(size_t n, const void *hint = 0) + { + util_guarded_mem_alloc(n * sizeof(T)); +#ifdef WITH_BLENDER_GUARDEDALLOC + (void)hint; + return (T*)MEM_mallocN_aligned(n * sizeof(T), 16, "Cycles Alloc"); +#else + return std::allocator<T>::allocate(n, hint); +#endif + } + + void deallocate(T *p, size_t n) + { + util_guarded_mem_free(n * sizeof(T)); +#ifdef WITH_BLENDER_GUARDEDALLOC + MEM_freeN((void*)p); +#else + std::allocator<T>::deallocate(p, n); +#endif + } + + GuardedAllocator() : std::allocator<T>() { } + GuardedAllocator(const GuardedAllocator &a) : std::allocator<T>(a) { } + template <class U> + GuardedAllocator(const GuardedAllocator<U> &a) : std::allocator<T>(a) { } + ~GuardedAllocator() { } +}; + +/* Get memory usage and peak from the guarded STL allocator. */ +size_t util_guarded_get_mem_used(void); +size_t util_guarded_get_mem_peak(void); + +CCL_NAMESPACE_END + +#endif /* __UTIL_GUARDED_ALLOCATOR_H__ */ |