* pthread_cond_wait.c (ptw32_cond_wait_cleanup):

  Remove code designed to avoid/prevent spurious wakeup
  problems. It is believed that the sem_timedwait() call
  is consuming a CV signal that it shouldn't and this is
  breaking the avoidance logic.

1 files changed, 27 insertions, 21 deletions

diff --git a/ptw32_threadDestroy.c b/ptw32_threadDestroy.c
index 8293b76..37fda08 100644
--- a/ptw32_threadDestroy.c
+++ b/ptw32_threadDestroy.c
@@ -7,32 +7,32 @@
  *
  * --------------------------------------------------------------------------
  *
- *      Pthreads-win32 - POSIX Threads Library for Win32
- *      Copyright(C) 1998 John E. Bossom
- *      Copyright(C) 1999,2002 Pthreads-win32 contributors
+ *	Pthreads-win32 - POSIX Threads Library for Win32
+ *	Copyright(C) 1998 John E. Bossom
+ *	Copyright(C) 1999,2002 Pthreads-win32 contributors
  * 
- *      Contact Email: rpj@ise.canberra.edu.au
+ *	Contact Email: rpj@ise.canberra.edu.au
  * 
- *      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
+ *	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 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.
+ *	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
+ *	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
  */
 
 #include "pthread.h"
@@ -44,6 +44,10 @@ ptw32_threadDestroy (pthread_t thread)
 {
   if (thread != NULL)
     {
+      (void) pthread_mutex_lock(&thread->cancelLock);
+      thread->state = PThreadStateLast;
+      (void) pthread_mutex_unlock(&thread->cancelLock);
+
       ptw32_callUserDestroyRoutines (thread);
 
       if (thread->cancelEvent != NULL)
@@ -51,6 +55,8 @@ ptw32_threadDestroy (pthread_t thread)
 	  CloseHandle (thread->cancelEvent);
 	}
 
+      (void) pthread_mutex_destroy(&thread->cancelLock);
+
 #if ! defined (__MINGW32__) || defined (__MSVCRT__)
       /* See documentation for endthread vs endthreadex. */
       if( thread->threadH != 0 )