diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-07 01:40:41 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-12 17:43:26 +0300 |
commit | c8d2bc78902422c89607a5778857de958e3bb837 (patch) | |
tree | 73355a2912eb64be5ecbe52f2d42b1da60d10f0c /intern/cycles/device/device.h | |
parent | 28604c46a137c1288cc7a494b36ed72e44a0ab8b (diff) |
Cycles: Always use guarded allocator of vectors
We don't have vectors re-allocation happening multiple times from inside
a loop anymore, so we can safely switch to a memory guarded allocator for
vectors and keep track on the memory usage at various stages of rendering.
Additionally, when building from inside Blender repository, Cycles will
use Blender's guarded allocator, so actual memory usage will be displayed
in the Space Info header.
There are couple of tricky aspects of the patch:
- TaskScheduler::exit() now explicitly frees memory used by `threads`.
This is needed because `threads` is a static member which destructor
isn't getting called on Blender's exit which caused memory leak print
to happen.
This shouldn't give any measurable speed issues, reallocation of that
vector is only one of fewzillion other allocations happening during
synchronization.
- Use regular guarded malloc (not aligned one). No idea why it was
made to be aligned in the first place. Perhaps some corner case tests
or so. Vector was never expected to be aligned anyway. Let's see if
we'll have actual bugs with this.
Reviewers: dingto, lukasstockner97, juicyfruit, brecht
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D1774
Diffstat (limited to 'intern/cycles/device/device.h')
-rw-r--r-- | intern/cycles/device/device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index c53cd888775..30d0003b940 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -269,9 +269,12 @@ public: /* Tag devices lists for update. */ static void tag_update(); + static void free_memory(); private: /* Indicted whether device types and devices lists were initialized. */ static bool need_types_update, need_devices_update; + static vector<DeviceType> types; + static vector<DeviceInfo> devices; }; CCL_NAMESPACE_END |