win32: Factor out common code to private function apr_wait_for_single_object().

This function almost the same as WaitForSingleObject() except it accepts
timeout value in microseconds, instead of milliseconds.

* include/arch/win32/apr_arch_misc.h
* misc/win32/misc.c
  (apr_wait_for_single_object): New. Factored out from thread_cond_timedwait().

* locks/win32/proc_mutex.c
* locks/win32/thread_cond.c
* locks/win32/thread_mutex.c
  (apr_proc_mutex_timedlock, thread_cond_timedwait,
   apr_thread_mutex_timedlock): Use apr_wait_for_single_object().

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1860075 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 30 insertions, 0 deletions

diff --git a/misc/win32/misc.c b/misc/win32/misc.c
index b6ee202b0..11b5b6b18 100644
--- a/misc/win32/misc.c
+++ b/misc/win32/misc.c
@@ -188,6 +188,36 @@ FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char* fnName, int ordinal)
 #endif
 }
 
+DWORD apr_wait_for_single_object(HANDLE handle, apr_interval_time_t timeout)
+{
+    apr_interval_time_t t = timeout;
+    DWORD res;
+    DWORD timeout_ms = 0;
+
+    do {
+        if (t < 0) {
+            timeout_ms = INFINITE;
+        }
+        else if (t > 0) {
+            /* Given timeout is 64bit usecs whereas Windows timeouts are
+             * 32bit msecs and below INFINITE (2^32 - 1), so we may need
+             * multiple timed out waits...
+             */
+            if (t > apr_time_from_msec(INFINITE - 1)) {
+                timeout_ms = INFINITE - 1;
+                t -= apr_time_from_msec(INFINITE - 1);
+            }
+            else {
+                timeout_ms = (DWORD)apr_time_as_msec(t);
+                t = 0;
+            }
+        }
+        res = WaitForSingleObject(handle, timeout_ms);
+    } while (res == WAIT_TIMEOUT && t > 0);
+
+    return res;
+}
+
 /* Declared in include/arch/win32/apr_dbg_win32_handles.h
  */
 APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln,