diff options
| author | Yann Ylavic <ylavic@apache.org> | 2017-04-07 00:01:16 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2017-04-07 00:01:16 +0000 |
| commit | f7b5a5f20e3edfb8ef2f4077147acb0bf17b3fab (patch) | |
| tree | 5c5c8a818d677acc7cf00a9b3cd5bfbf9a669977 /include/apr_thread_mutex.h | |
| parent | 0ea4c151aa5f650867a0afa3e92f90fc1bdbf114 (diff) | |
| download | apr-f7b5a5f20e3edfb8ef2f4077147acb0bf17b3fab.tar.gz | |
locks: follow up to r1667900.
Axe the 'absolute' argument of apr_{thread,proc,global}_mutex_timedlock()
which was confusing, hence 'timeout' is always relative now.
It still makes sense (to me) to handle a negative timeout as INFINITE, a nul
one as IMMEDIATE, and a positive one as an upper bound timeout (like most if
not all of the underlying system calls...).
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1790488 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_thread_mutex.h')
| -rw-r--r-- | include/apr_thread_mutex.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/apr_thread_mutex.h b/include/apr_thread_mutex.h index 5dd729d07..efc62f65a 100644 --- a/include/apr_thread_mutex.h +++ b/include/apr_thread_mutex.h @@ -87,12 +87,10 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex); * Attempt to acquire the lock for the given mutex until timeout expires. * If the acquisition time outs, the call returns with APR_TIMEUP. * @param mutex the mutex on which to attempt the lock acquiring. - * @param timeout the absolute time or relative timeout (microseconds) - * @param absolute whether the timeout given is absolute (!0) or relative (0) + * @param timeout the relative timeout (microseconds) */ APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex, - apr_time_t timeout, - int absolute); + apr_time_t timeout); /** * Release the lock for the given mutex. |