diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-08-23 07:40:04 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-08-23 13:54:25 +0300 |
| commit | 2540741dee789f752687198c6f272a995d45073e (patch) | |
| tree | 4d03f3ce032f67fdb3704b461bc51c3d02b6e7e1 /intern/cycles/util/util_stats.h | |
| parent | 5c60721c9e3d5af2bd4f80b3013fe0c804cf7531 (diff) | |
Fix implementation of atomic update max and move to a central location
While unlikely to have had any serious effects because of limited use, the
previous implementation was not actually atomic due to a data race and
incorrectly coded CAS loop. We also had duplicates of this code in a few
places, it's now been moved to a single location with all other atomic
operations.
Diffstat (limited to 'intern/cycles/util/util_stats.h')
| -rw-r--r-- | intern/cycles/util/util_stats.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_stats.h b/intern/cycles/util/util_stats.h index baba549753d..7667f58eb7d 100644 --- a/intern/cycles/util/util_stats.h +++ b/intern/cycles/util/util_stats.h @@ -30,7 +30,7 @@ public: void mem_alloc(size_t size) { atomic_add_and_fetch_z(&mem_used, size); - atomic_update_max_z(&mem_peak, mem_used); + atomic_fetch_and_update_max_z(&mem_peak, mem_used); } void mem_free(size_t size) { |