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/guardedalloc | |
| 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/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_lockfree_impl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c index b4838cdca18..66573b91ace 100644 --- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c +++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c @@ -76,12 +76,7 @@ enum { MEM_INLINE void update_maximum(size_t *maximum_value, size_t value) { #ifdef USE_ATOMIC_MAX - size_t prev_value = *maximum_value; - while (prev_value < value) { - if (atomic_cas_z(maximum_value, prev_value, value) != prev_value) { - break; - } - } + atomic_fetch_and_update_max_z(maximum_value, value); #else *maximum_value = value > *maximum_value ? value : *maximum_value; #endif |