diff options
| author | Christopher Faylor <me@cgf.cx> | 2014-06-05 23:50:24 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2014-06-05 23:50:24 +0400 |
| commit | 4d79de90e119c12adcadb5c00208ce608d385dd3 (patch) | |
| tree | bdff26b5188eab186d1a96151c2dbd00aef0f4b3 | |
| parent | f9f90410fd78d44f06aef3cc34433f48dedf1882 (diff) | |
* timer.cc (timer_tracker::cancel): Demote api_fatal to system_printf, printing
more details about odd failure condition.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/timer.cc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d69f5bbb1..a08fb7110 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2014-06-05 Christopher Faylor <me.cygwin2014@cgf.cx> + + * timer.cc (timer_tracker::cancel): Demote api_fatal to system_printf, + printing more details about odd failure condition. + 2014-05-23 Corinna Vinschen <corinna@vinschen.de> * autoload.cc (ldap_memfreeW): Remove. diff --git a/winsup/cygwin/timer.cc b/winsup/cygwin/timer.cc index 5231499fb..b1c6e27aa 100644 --- a/winsup/cygwin/timer.cc +++ b/winsup/cygwin/timer.cc @@ -66,8 +66,9 @@ timer_tracker::cancel () return false; SetEvent (hcancel); - if (WaitForSingleObject (syncthread, INFINITE) != WAIT_OBJECT_0) - api_fatal ("WFSO failed waiting for timer thread, %E"); + DWORD res = WaitForSingleObject (syncthread, INFINITE); + if (res != WAIT_OBJECT_0) + system_printf ("WFSO returned unexpected value %u, %E", res); return true; } |