diff options
| author | Joost VandeVondele <vondele@gcc.gnu.org> | 2015-08-24 11:01:25 +0000 |
|---|---|---|
| committer | Joost VandeVondele <vondele@gcc.gnu.org> | 2015-08-24 11:01:25 +0000 |
| commit | bfe7ac89a0be108eaccfa277db28ed6141a3d5af (patch) | |
| tree | 9ce340525056994200979fde5121c358e4f37981 /libgomp/config/linux | |
| parent | d485982286692075d175dbbcf17d00431106ce96 (diff) | |
| download | gcc-bfe7ac89a0be108eaccfa277db28ed6141a3d5af.zip gcc-bfe7ac89a0be108eaccfa277db28ed6141a3d5af.tar.gz gcc-bfe7ac89a0be108eaccfa277db28ed6141a3d5af.tar.bz2 | |
re PR libgomp/66761 (libgomp: ThreadSanitizer: data race in libgomp)
PR libgomp/66761
PR libgomp/67303
* iter.c (gomp_iter_dynamic_next): Employ an atomic load.
(gomp_iter_guided_next): Idem.
* iter_ull.c (gomp_iter_ull_dynamic_next): Idem.
(gomp_iter_ull_guided_next): Idem.
* config/linux/wait.h (do_spin): Idem.
From-SVN: r227119
Diffstat (limited to 'libgomp/config/linux')
| -rw-r--r-- | libgomp/config/linux/wait.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libgomp/config/linux/wait.h b/libgomp/config/linux/wait.h index 7f57454..e561c2d 100644 --- a/libgomp/config/linux/wait.h +++ b/libgomp/config/linux/wait.h @@ -49,7 +49,9 @@ static inline int do_spin (int *addr, int val) { unsigned long long i, count = gomp_spin_count_var; - if (__builtin_expect (gomp_managed_threads > gomp_available_cpus, 0)) + if (__builtin_expect (__atomic_load_n (&gomp_managed_threads, + MEMMODEL_RELAXED) + > gomp_available_cpus, 0)) count = gomp_throttled_spin_count_var; for (i = 0; i < count; i++) if (__builtin_expect (__atomic_load_n (addr, MEMMODEL_RELAXED) != val, 0)) |