diff options
| author | Alan Modra <amodra@gmail.com> | 2013-01-22 11:41:53 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-01-22 11:41:53 +0000 |
| commit | fbf9ba9e2a811a9924cf8ff368e8a1a2004c8cf7 (patch) | |
| tree | fe198ebe6a2ed3b92472162492a8abbaf38411da | |
| parent | 789fc66cdd0b25b0ecd35e95b2accce5b3bff648 (diff) | |
PR libgomp/51376
PR libgomp/56073
* task.c (GOMP_task): Revert 2011-12-09 change.
(GOMP_taskwait): Likewise. Instead use atomic load with acquire
barrier to read task->children..
(gomp_barrier_handle_tasks): ..and matching atomic store with
release barrier here when setting parent->children to NULL.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@195370 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libgomp/ChangeLog | 10 | ||||
| -rw-r--r-- | libgomp/task.c | 16 |
2 files changed, 21 insertions, 5 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 3bc553ace81..266a66e7b8f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,13 @@ +2013-01-22 Alan Modra <amodra@gmail.com> + + PR libgomp/51376 + PR libgomp/56073 + * task.c (GOMP_task): Revert 2011-12-09 change. + (GOMP_taskwait): Likewise. Instead use atomic load with acquire + barrier to read task->children.. + (gomp_barrier_handle_tasks): ..and matching atomic store with + release barrier here when setting parent->children to NULL. + 2013-01-16 Jakub Jelinek <jakub@redhat.com> Tobias Burnus <burnus@net-b.de> diff --git a/libgomp/task.c b/libgomp/task.c index be8b431c9ac..937f266cef3 100644 --- a/libgomp/task.c +++ b/libgomp/task.c @@ -116,11 +116,10 @@ GOMP_task (void (*fn) (void *), void *data, void (*cpyfn) (void *, void *), } else fn (data); - if (team != NULL) + if (task.children != NULL) { gomp_mutex_lock (&team->task_lock); - if (task.children != NULL) - gomp_clear_parent (task.children); + gomp_clear_parent (task.children); gomp_mutex_unlock (&team->task_lock); } gomp_end_task (); @@ -258,7 +257,13 @@ gomp_barrier_handle_tasks (gomp_barrier_state_t state) parent->children = child_task->next_child; else { - parent->children = NULL; + /* We access task->children in GOMP_taskwait + outside of the task lock mutex region, so + need a release barrier here to ensure memory + written by child_task->fn above is flushed + before the NULL is written. */ + __atomic_store_n (&parent->children, NULL, + MEMMODEL_RELEASE); if (parent->in_taskwait) gomp_sem_post (&parent->taskwait_sem); } @@ -291,7 +296,8 @@ GOMP_taskwait (void) struct gomp_task *child_task = NULL; struct gomp_task *to_free = NULL; - if (task == NULL || team == NULL) + if (task == NULL + || __atomic_load_n (&task->children, MEMMODEL_ACQUIRE) == NULL) return; gomp_mutex_lock (&team->task_lock); |