From 5698171a3f3c7d8dd535466fd8f54e9deb8f170f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 20 Apr 2009 17:13:19 +0000 Subject: [PATCH] * flock.cc (lf_setlock): Handle border case which results in WFMO loop exiting with ret == WAIT_TIMEOUT gracefully. Add a system_printf to uncover other potential problems with WFMO loop. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/flock.cc | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 59ac132f7..47b3efd7b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2009-04-20 Corinna Vinschen + + * flock.cc (lf_setlock): Handle border case which results in WFMO loop + exiting with ret == WAIT_TIMEOUT gracefully. Add a system_printf to + uncover other potential problems with WFMO loop. + 2009-04-18 Christopher Faylor * mkimport: Specify .text for stub explicitly. diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc index e17166044..8fd71391a 100644 --- a/winsup/cygwin/flock.cc +++ b/winsup/cygwin/flock.cc @@ -971,6 +971,12 @@ lf_setlock (lockf_t *lock, inode_t *node, lockf_t **clean, HANDLE fhdl) ret = WaitForMultipleObjects (2, w4, FALSE, 100L); } while (ret == WAIT_TIMEOUT && get_obj_handle_count (obj) > 1); + /* There's a good chance that the above loop is left with + ret == WAIT_TIMEOUT if another process closes the file handle + associated with this lock. This is for all practical purposes + equivalent to a signalled lock object. */ + if (ret == WAIT_TIMEOUT) + ret = WAIT_OBJECT_0; } node->LOCK (); node->unwait (); @@ -991,6 +997,8 @@ lf_setlock (lockf_t *lock, inode_t *node, lockf_t **clean, HANDLE fhdl) _my_tls.call_signal_handler (); return EINTR; default: + system_printf ("Shouldn't happen! ret = %lu, error: %lu\n", + ret, GetLastError ()); return geterrno_from_win_error (); } }