diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-11-21 21:29:14 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-11-21 21:29:14 +0100 |
| commit | 4c5ba8d0dba408aae0ab739e978fe0e64ba83f13 (patch) | |
| tree | 887d040b2c5718a47cc686597241eadd3156c25e /libgomp | |
| parent | b4b401d23c09aa0a4f8289c69832f4e2aa04bdc2 (diff) | |
| download | gcc-4c5ba8d0dba408aae0ab739e978fe0e64ba83f13.zip gcc-4c5ba8d0dba408aae0ab739e978fe0e64ba83f13.tar.gz gcc-4c5ba8d0dba408aae0ab739e978fe0e64ba83f13.tar.bz2 | |
re PR libgomp/55411 (OMP threads lose their OMP_WAIT_POLICY when another OMP thread gets destructed)
PR libgomp/55411
* team.c (gomp_free_thread): Decrease gomp_managed_threads
if pool had any threads_used.
From-SVN: r193706
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/team.c | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index c114a2e..ceebbfa 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2012-11-21 Jakub Jelinek <jakub@redhat.com> + + PR libgomp/55411 + * team.c (gomp_free_thread): Decrease gomp_managed_threads + if pool had any threads_used. + 2012-11-07 Jack Howarth <howarth@bromo.med.uc.edu> * testsuite/libgomp.c++/pr24455.C: Use diff --git a/libgomp/team.c b/libgomp/team.c index 633902c..110bd47 100644 --- a/libgomp/team.c +++ b/libgomp/team.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011 +/* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. Contributed by Richard Henderson <rth@redhat.com>. @@ -232,6 +232,15 @@ gomp_free_thread (void *arg __attribute__((unused))) gomp_barrier_wait (&pool->threads_dock); /* Now it is safe to destroy the barrier and free the pool. */ gomp_barrier_destroy (&pool->threads_dock); + +#ifdef HAVE_SYNC_BUILTINS + __sync_fetch_and_add (&gomp_managed_threads, + 1L - pool->threads_used); +#else + gomp_mutex_lock (&gomp_remaining_threads_lock); + gomp_managed_threads -= pool->threads_used - 1L; + gomp_mutex_unlock (&gomp_remaining_threads_lock); +#endif } free (pool->threads); if (pool->last_team) |