apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r290768 - in /apr/apr/branches/1.2.x: CHANGES locks/win32/proc_mutex.c
Date Wed, 21 Sep 2005 18:06:49 GMT
Author: wrowe
Date: Wed Sep 21 11:06:46 2005
New Revision: 290768

URL: http://svn.apache.org/viewcvs?rev=290768&view=rev
Log:

  Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
  returning APR_EBUSY.

Backport:     290766
Submitted by: Ronen Mizrahi <ronen tversity.com>
Reviewed by:  wrowe, Henry Jen

Modified:
    apr/apr/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/locks/win32/proc_mutex.c

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/CHANGES?rev=290768&r1=290767&r2=290768&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES (original)
+++ apr/apr/branches/1.2.x/CHANGES Wed Sep 21 11:06:46 2005
@@ -1,5 +1,8 @@
 Changes for APR 1.2.2
 
+  *) Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
+     returning APR_EBUSY.  [Ronen Mizrahi <ronen@tversity.com>]
+
   *) Fix apr_socket_opt_set() issue where TCP_NODELAY would be
      set when TCP_DEFER_ACCEPT was set.  [Brian Pane]
 

Modified: apr/apr/branches/1.2.x/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.2.x/locks/win32/proc_mutex.c?rev=290768&r1=290767&r2=290768&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/locks/win32/proc_mutex.c (original)
+++ apr/apr/branches/1.2.x/locks/win32/proc_mutex.c Wed Sep 21 11:06:46 2005
@@ -132,6 +132,9 @@
 
     if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
         return APR_SUCCESS;
+    } 
+    else if (rv == WAIT_TIMEOUT) {
+        return APR_EBUSY;
     }
     return apr_get_os_error();
 }
@@ -144,6 +147,9 @@
 
     if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
         return APR_SUCCESS;
+    } 
+    else if (rv == WAIT_TIMEOUT) {
+        return APR_EBUSY;
     }
     return apr_get_os_error();
 }



Mime
View raw message