You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2017/06/02 18:35:07 UTC
svn commit: r1797415 - in /apr/apr/trunk/locks: beos/proc_mutex.c
os2/proc_mutex.c win32/proc_mutex.c
Author: wrowe
Date: Fri Jun 2 18:35:07 2017
New Revision: 1797415
URL: http://svn.apache.org/viewvc?rev=1797415&view=rev
Log:
On Windows, OS2 and BEOS, the singluar lock mechanisms were already compatible
with timed locks, so there is no delta between DEFAULT and DEFAULT_TIMED.
Avoid gratuitous API changes to typical OS lock information.
Modified:
apr/apr/trunk/locks/beos/proc_mutex.c
apr/apr/trunk/locks/os2/proc_mutex.c
apr/apr/trunk/locks/win32/proc_mutex.c
Modified: apr/apr/trunk/locks/beos/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/beos/proc_mutex.c?rev=1797415&r1=1797414&r2=1797415&view=diff
==============================================================================
--- apr/apr/trunk/locks/beos/proc_mutex.c (original)
+++ apr/apr/trunk/locks/beos/proc_mutex.c Fri Jun 2 18:35:07 2017
@@ -168,7 +168,7 @@ APR_DECLARE(const char *) apr_proc_mutex
APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex)
{
- return APR_LOCK_DEFAULT_TIMED;
+ return APR_LOCK_DEFAULT;
}
APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
@@ -194,7 +194,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
ospmutex->sem = pmutex->Lock;
ospmutex->ben = pmutex->LockCount;
if (mech) {
- *mech = APR_LOCK_DEFAULT_TIMED;
+ *mech = APR_LOCK_DEFAULT;
}
return APR_SUCCESS;
}
@@ -236,7 +236,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
apr_os_proc_mutex_t *ospmutex,
apr_pool_t *pool)
{
- return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT_TIMED,
+ return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT,
0, pool);
}
Modified: apr/apr/trunk/locks/os2/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/os2/proc_mutex.c?rev=1797415&r1=1797414&r2=1797415&view=diff
==============================================================================
--- apr/apr/trunk/locks/os2/proc_mutex.c (original)
+++ apr/apr/trunk/locks/os2/proc_mutex.c Fri Jun 2 18:35:07 2017
@@ -62,7 +62,7 @@ APR_DECLARE(const char *) apr_proc_mutex
APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex)
{
- return APR_LOCK_DEFAULT_TIMED;
+ return APR_LOCK_DEFAULT;
}
APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
@@ -240,7 +240,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
{
*ospmutex = pmutex->hMutex;
if (mech) {
- *mech = APR_LOCK_DEFAULT_TIMED;
+ *mech = APR_LOCK_DEFAULT;
}
return APR_SUCCESS;
}
@@ -283,7 +283,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
apr_os_proc_mutex_t *ospmutex,
apr_pool_t *pool)
{
- return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT_TIMED,
+ return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT,
0, pool);
}
Modified: apr/apr/trunk/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/win32/proc_mutex.c?rev=1797415&r1=1797414&r2=1797415&view=diff
==============================================================================
--- apr/apr/trunk/locks/win32/proc_mutex.c (original)
+++ apr/apr/trunk/locks/win32/proc_mutex.c Fri Jun 2 18:35:07 2017
@@ -228,7 +228,7 @@ APR_DECLARE(const char *) apr_proc_mutex
APR_DECLARE(apr_lockmech_e) apr_proc_mutex_mech(apr_proc_mutex_t *mutex)
{
- return APR_LOCK_DEFAULT_TIMED;
+ return APR_LOCK_DEFAULT;
}
APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
@@ -253,7 +253,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
{
*ospmutex = pmutex->handle;
if (mech) {
- *mech = APR_LOCK_DEFAULT_TIMED;
+ *mech = APR_LOCK_DEFAULT;
}
return APR_SUCCESS;
}
@@ -295,7 +295,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mu
apr_os_proc_mutex_t *ospmutex,
apr_pool_t *pool)
{
- return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT_TIMED,
+ return apr_os_proc_mutex_put_ex(pmutex, ospmutex, APR_LOCK_DEFAULT,
0, pool);
}