From 3be2cd04054844e63d05ace2f31b90f8c76ff925 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 21 Jul 2014 16:32:09 +0000 Subject: [PATCH] * thread.cc (pthread::init_mainthread): Initialize thread mutex to type PTHREAD_MUTEX_RECURSIVE, just as for any other thread. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/thread.cc | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2e315c7c2..93896c88c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2014-07-21 Corinna Vinschen + + * thread.cc (pthread::init_mainthread): Initialize thread mutex to + type PTHREAD_MUTEX_RECURSIVE, just as for any other thread. + 2014-07-21 Corinna Vinschen * include/cygwin/version.h (CYGWIN_VERSION_DLL_MINOR): Bump to 32. diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index fc70c3752..dc4faac7c 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -358,6 +358,10 @@ pthread::init_mainthread () if (!thread->create_cancel_event ()) api_fatal ("couldn't create cancel event for main thread"); VerifyHandle (thread->win32_obj_id); + /* Make sure the pthread mutex is recursive. See comment in + pthread::precreate (called only for subsequent pthreads) + for a description. */ + thread->mutex.set_type (PTHREAD_MUTEX_RECURSIVE); thread->postcreate (); }