* timer.cc (timer_tracker::cancel): Demote api_fatal to system_printf, printing

more details about odd failure condition.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d69f5bbb118982bd5674047d84998aa3de681575..a08fb7110cc725a1fe7061aae0694d382087e62a 100644 (file)
--- 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 5231499fb46e910a90dc4d1386cde483c1ef4591..b1c6e27aa13bcfaeb1cde8a8612f0963d2a3e57d 100644 (file)
--- 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;
 }