* bsd_mutex.cc (_msleep): Reset event object and close it before

	entering mutex.  Turn order of conditional for better readability.

diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 6348124..34063db 100644 (file)
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-30  Corinna Vinschen  <corinna@vinschen.de>
+
+       * bsd_mutex.cc (_msleep): Reset event object and close it before
+       entering mutex.  Turn order of conditional for better readability.
+
 2004-07-26  Corinna Vinschen  <corinna@vinschen.de>
 
        * cygserver.conf: Describe relation between shmmaxpgs and SHMMAX.

diff --git a/winsup/cygserver/bsd_mutex.cc b/winsup/cygserver/bsd_mutex.cc
index 1a01dd2..449e614 100644 (file)
--- a/winsup/cygserver/bsd_mutex.cc
+++ b/winsup/cygserver/bsd_mutex.cc
@@ -222,10 +222,12 @@ _msleep (void *ident, struct mtx *mtx, int priority,
        panic ("wait in msleep (%s) failed, %E", wmesg);
        break;
     }
+  /* Dismiss event before entering mutex. */
+  ResetEvent (evt);
+  CloseHandle (evt);
   set_priority (old_priority);
-  if (!(priority & PDROP) && mtx)
+  if (mtx && !(priority & PDROP))
     mtx_lock (mtx);
-  CloseHandle (evt);
   return ret;
 }