Merge r1790521, r1790523 from trunk:

locks: follow up to r1790488.

Make it clear in the type that it's a relative/interval time.


locks: follow up to r1790488 and r1790521: likewise for the
apr_proc_mutex_unix_lock_methods_t's timedacquired method.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790527 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 16 insertions, 16 deletions

diff --git a/locks/beos/proc_mutex.c b/locks/beos/proc_mutex.c
index dba07c0a5..e97a2ee80 100644
--- a/locks/beos/proc_mutex.c
+++ b/locks/beos/proc_mutex.c
@@ -109,7 +109,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex,
-                                                   apr_time_t timeout)
+                                               apr_interval_time_t timeout)
 {
     int32 stat;
 
diff --git a/locks/beos/thread_mutex.c b/locks/beos/thread_mutex.c
index 62e81319e..f9353509f 100644
--- a/locks/beos/thread_mutex.c
+++ b/locks/beos/thread_mutex.c
@@ -132,7 +132,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
-                                                     apr_time_t timeout)
+                                                 apr_interval_time_t timeout)
 {
     int32 stat;
     thread_id me = find_thread(NULL);
diff --git a/locks/netware/proc_mutex.c b/locks/netware/proc_mutex.c
index c619f08c0..639748533 100644
--- a/locks/netware/proc_mutex.c
+++ b/locks/netware/proc_mutex.c
@@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex,
-                                                   apr_time_t timeout)
+                                               apr_interval_time_t timeout)
 {
     if (mutex)
         return apr_thread_mutex_timedlock(mutex->mutex, timeout);
diff --git a/locks/netware/thread_mutex.c b/locks/netware/thread_mutex.c
index ecb0112f4..127610d3e 100644
--- a/locks/netware/thread_mutex.c
+++ b/locks/netware/thread_mutex.c
@@ -112,7 +112,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
-                                                     apr_time_t timeout)
+                                                 apr_interval_time_t timeout)
 {
     if (mutex->cond) {
         apr_status_t rv;
diff --git a/locks/os2/proc_mutex.c b/locks/os2/proc_mutex.c
index 2fe75afa0..564c49cf6 100644
--- a/locks/os2/proc_mutex.c
+++ b/locks/os2/proc_mutex.c
@@ -162,7 +162,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
 
 
 APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex,
-                                                   apr_time_t timeout)
+                                               apr_interval_time_t timeout)
 {
     ULONG rc;
     
diff --git a/locks/os2/thread_mutex.c b/locks/os2/thread_mutex.c
index 6dd1f0b68..f95ba0fec 100644
--- a/locks/os2/thread_mutex.c
+++ b/locks/os2/thread_mutex.c
@@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
 
 
 APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
-                                                     apr_time_t timeout)
+                                                 apr_interval_time_t timeout)
 {
     ULONG rc;
 
diff --git a/locks/unix/global_mutex.c b/locks/unix/global_mutex.c
index 9aa213eb2..22592060d 100644
--- a/locks/unix/global_mutex.c
+++ b/locks/unix/global_mutex.c
@@ -143,7 +143,7 @@ APR_DECLARE(apr_status_t) apr_global_mutex_trylock(apr_global_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_global_mutex_timedlock(apr_global_mutex_t *mutex,
-                                                     apr_time_t timeout)
+                                                 apr_interval_time_t timeout)
 {
     apr_status_t rv;
 
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index bc7b8fad3..9d199b30e 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -56,7 +56,7 @@ static apr_status_t proc_mutex_no_perms_set(apr_proc_mutex_t *mutex,
         && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) \
         && !defined(HAVE_PTHREAD_CONDATTR_SETPSHARED))
 static apr_status_t proc_mutex_spinsleep_timedacquire(apr_proc_mutex_t *mutex,
-                                                      apr_time_t timeout)
+                                                  apr_interval_time_t timeout)
 {
     apr_status_t rv;
     if (timeout < 0) {
@@ -228,7 +228,7 @@ static apr_status_t proc_mutex_posix_tryacquire(apr_proc_mutex_t *mutex)
 
 #if defined(HAVE_SEM_TIMEDWAIT)
 static apr_status_t proc_mutex_posix_timedacquire(apr_proc_mutex_t *mutex,
-                                                  apr_time_t timeout)
+                                              apr_interval_time_t timeout)
 {
     if (timeout < 0) {
         return proc_mutex_posix_acquire(mutex);
@@ -386,7 +386,7 @@ static apr_status_t proc_mutex_sysv_tryacquire(apr_proc_mutex_t *mutex)
 
 #if defined(HAVE_SEMTIMEDOP)
 static apr_status_t proc_mutex_sysv_timedacquire(apr_proc_mutex_t *mutex,
-                                                 apr_time_t timeout)
+                                             apr_interval_time_t timeout)
 {
     if (timeout < 0) {
         return proc_mutex_sysv_acquire(mutex);
@@ -516,7 +516,7 @@ typedef struct {
 
 
 static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex,
-                                                    apr_time_t timeout);
+                                                apr_interval_time_t timeout);
 
 static APR_INLINE int proc_pthread_mutex_inc(apr_proc_mutex_t *mutex)
 {
@@ -708,7 +708,7 @@ static apr_status_t proc_mutex_pthread_tryacquire(apr_proc_mutex_t *mutex)
 }
 
 static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex,
-                                                    apr_time_t timeout)
+                                                apr_interval_time_t timeout)
 {
 #if !APR_USE_PROC_PTHREAD_MUTEX_COND && !defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
     return proc_mutex_spinsleep_timedacquire(mutex, timeout);
@@ -1561,7 +1561,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex,
-                                                   apr_time_t timeout)
+                                               apr_interval_time_t timeout)
 {
     return mutex->meth->timedacquire(mutex, timeout);
 }
diff --git a/locks/unix/thread_mutex.c b/locks/unix/thread_mutex.c
index be2d86586..6a26ff239 100644
--- a/locks/unix/thread_mutex.c
+++ b/locks/unix/thread_mutex.c
@@ -190,7 +190,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
-                                                     apr_time_t timeout)
+                                                 apr_interval_time_t timeout)
 {
     apr_status_t rv = APR_ENOTIMPL;
 
diff --git a/locks/win32/proc_mutex.c b/locks/win32/proc_mutex.c
index 7c3df23dc..c85853d63 100644
--- a/locks/win32/proc_mutex.c
+++ b/locks/win32/proc_mutex.c
@@ -165,7 +165,7 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_proc_mutex_timedlock(apr_proc_mutex_t *mutex,
-                                                   apr_time_t timeout)
+                                               apr_interval_time_t timeout)
 {
     DWORD rv;
 
diff --git a/locks/win32/thread_mutex.c b/locks/win32/thread_mutex.c
index 05dc3d5fb..49198427a 100644
--- a/locks/win32/thread_mutex.c
+++ b/locks/win32/thread_mutex.c
@@ -115,7 +115,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
 }
 
 APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
-                                                     apr_time_t timeout)
+                                                 apr_interval_time_t timeout)
 {
     if (mutex->type != thread_mutex_critical_section) {
         DWORD rv, timeout_ms;