From 76a3f968a57035c29d74aeb79017d7ca9dd931d7 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 27 Jun 2004 19:16:48 +0000 Subject: [PATCH] * thread.cc (__cygwin_lock_lock): Don't bother locking when there is only one known thread. (__cygwin_lock_unlock): Ditto for unlocking. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/thread.cc | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7af3e9c83..39af363f7 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2004-06-27 Christopher Faylor + + * thread.cc (__cygwin_lock_lock): Don't bother locking when there is + only one known thread. + (__cygwin_lock_unlock): Ditto for unlocking. + 2004-06-23 Tomas Ukkonen * fhandler_proc.cc (format_proc_cpuinfo): Test CPU vendor and print diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index a248b2604..7ba7399b6 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -79,7 +79,13 @@ __cygwin_lock_fini (_LOCK_T *lock) extern "C" void __cygwin_lock_lock (_LOCK_T *lock) { - pthread_mutex_lock ((pthread_mutex_t*) lock); + if (MT_INTERFACE->threadcount <= 1) + paranoid_printf ("threadcount %d. not locking", MT_INTERFACE->threadcount); + else + { + paranoid_printf ("threadcount %d. locking", MT_INTERFACE->threadcount); + pthread_mutex_lock ((pthread_mutex_t*) lock); + } } extern "C" int @@ -92,7 +98,13 @@ __cygwin_lock_trylock (_LOCK_T *lock) extern "C" void __cygwin_lock_unlock (_LOCK_T *lock) { - pthread_mutex_unlock ((pthread_mutex_t*) lock); + if (MT_INTERFACE->threadcount <= 1) + paranoid_printf ("threadcount %d. not unlocking", MT_INTERFACE->threadcount); + else + { + pthread_mutex_unlock ((pthread_mutex_t*) lock); + paranoid_printf ("threadcount %d. unlocked", MT_INTERFACE->threadcount); + } } inline LPCRITICAL_SECTION