apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1795951 - /apr/apr/branches/1.6.x/locks/unix/misc.c
Date Tue, 23 May 2017 19:19:43 GMT
Author: wrowe
Date: Tue May 23 19:19:43 2017
New Revision: 1795951

URL: http://svn.apache.org/viewvc?rev=1795951&view=rev
Log:
Revert 1790112 (r1790111 on trunk)


Modified:
    apr/apr/branches/1.6.x/locks/unix/misc.c

Modified: apr/apr/branches/1.6.x/locks/unix/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/locks/unix/misc.c?rev=1795951&r1=1795950&r2=1795951&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/locks/unix/misc.c (original)
+++ apr/apr/branches/1.6.x/locks/unix/misc.c Tue May 23 19:19:43 2017
@@ -50,10 +50,6 @@ int pthread_mutex_timedlock(pthread_mute
        remaining.tv_sec--;
        remaining.tv_nsec = (NANOSECS_PER_SEC - (tod.tv_nsec - remaining.tv_nsec));
    }
-   /* If we had a REALLY small timeout ;) */
-   if (remaining.tv_sec < 0) {
-       return pthread_mutex_trylock(mutex);
-   }
    while ((rv = pthread_mutex_trylock(mutex)) == EBUSY) {
        ts.tv_sec = 0;
        ts.tv_nsec = (remaining.tv_sec > 0 ? SLEEP_TIME_NS : 



Mime
View raw message