diff options
Diffstat (limited to 'libs/pthreads/src/pthread_detach.c')
| -rw-r--r-- | libs/pthreads/src/pthread_detach.c | 58 |
1 files changed, 33 insertions, 25 deletions
diff --git a/libs/pthreads/src/pthread_detach.c b/libs/pthreads/src/pthread_detach.c index 9ff6587f3c..3bbe4a11b2 100644 --- a/libs/pthreads/src/pthread_detach.c +++ b/libs/pthreads/src/pthread_detach.c @@ -7,34 +7,38 @@ * * -------------------------------------------------------------------------- * - * Pthreads-win32 - POSIX Threads Library for Win32 + * Pthreads4w - POSIX Threads Library for Win32 * Copyright(C) 1998 John E. Bossom - * Copyright(C) 1999,2005 Pthreads-win32 contributors - * - * Contact Email: rpj@callisto.canberra.edu.au - * + * Copyright(C) 1999-2018, Pthreads4w contributors + * + * Homepage: https://sourceforge.net/projects/pthreads4w/ + * * The current list of contributors is contained * in the file CONTRIBUTORS included with the source * code distribution. The list can also be seen at the * following World Wide Web location: - * http://sources.redhat.com/pthreads-win32/contributors.html - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library in the file COPYING.LIB; - * if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * https://sourceforge.net/p/pthreads4w/wiki/Contributors/ + * + * This file is part of Pthreads4w. + * + * Pthreads4w is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pthreads4w is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Pthreads4w. If not, see <http://www.gnu.org/licenses/>. * */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "pthread.h" #include "implement.h" @@ -77,9 +81,9 @@ pthread_detach (pthread_t thread) int result; BOOL destroyIt = PTW32_FALSE; ptw32_thread_t * tp = (ptw32_thread_t *) thread.p; - ptw32_mcs_local_node_t node; + ptw32_mcs_local_node_t reuseLock; - ptw32_mcs_lock_acquire(&ptw32_thread_reuse_lock, &node); + ptw32_mcs_lock_acquire(&ptw32_thread_reuse_lock, &reuseLock); if (NULL == tp || thread.x != tp->ptHandle.x) @@ -101,9 +105,13 @@ pthread_detach (pthread_t thread) result = 0; ptw32_mcs_lock_acquire (&tp->stateLock, &stateLock); - if (tp->state != PThreadStateLast) + if (tp->state < PThreadStateLast) { tp->detachState = PTHREAD_CREATE_DETACHED; + if (tp->state == PThreadStateExiting) + { + destroyIt = PTW32_TRUE; + } } else if (tp->detachState != PTHREAD_CREATE_DETACHED) { @@ -115,7 +123,7 @@ pthread_detach (pthread_t thread) ptw32_mcs_lock_release (&stateLock); } - ptw32_mcs_lock_release(&node); + ptw32_mcs_lock_release(&reuseLock); if (result == 0) { |