"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "locks/win32/thread_mutex.c" between
apr-1.6.5.tar.bz2 and apr-1.7.0.tar.bz2

About: APR (Apache Portable Runtime) project offers software libraries that provide a predictable and consistent interface to underlying platform-specific implementations (APR core library).

thread_mutex.c  (apr-1.6.5.tar.bz2):thread_mutex.c  (apr-1.7.0.tar.bz2)
skipping to change at line 57 skipping to change at line 57
(*mutex)->pool = pool; (*mutex)->pool = pool;
if (flags & APR_THREAD_MUTEX_UNNESTED) { if (flags & APR_THREAD_MUTEX_UNNESTED) {
/* Use an auto-reset signaled event, ready to accept one /* Use an auto-reset signaled event, ready to accept one
* waiting thread. * waiting thread.
*/ */
(*mutex)->type = thread_mutex_unnested_event; (*mutex)->type = thread_mutex_unnested_event;
(*mutex)->handle = CreateEvent(NULL, FALSE, TRUE, NULL); (*mutex)->handle = CreateEvent(NULL, FALSE, TRUE, NULL);
} }
else if (flags & APR_THREAD_MUTEX_TIMED) {
(*mutex)->type = thread_mutex_nested_mutex;
(*mutex)->handle = CreateMutex(NULL, FALSE, NULL);
}
else { else {
#if APR_HAS_UNICODE_FS #if APR_HAS_UNICODE_FS
/* Critical Sections are terrific, performance-wise, on NT. /* Critical Sections are terrific, performance-wise, on NT.
* On Win9x, we cannot 'try' on a critical section, so we * On Win9x, we cannot 'try' on a critical section, so we
* use a [slower] mutex object, instead. * use a [slower] mutex object, instead.
*/ */
IF_WIN_OS_IS_UNICODE { IF_WIN_OS_IS_UNICODE {
InitializeCriticalSection(&(*mutex)->section); InitializeCriticalSection(&(*mutex)->section);
(*mutex)->type = thread_mutex_critical_section; (*mutex)->type = thread_mutex_critical_section;
(*mutex)->handle = NULL;
} }
#endif #endif
#if APR_HAS_ANSI_FS #if APR_HAS_ANSI_FS
ELSE_WIN_OS_IS_ANSI { ELSE_WIN_OS_IS_ANSI {
(*mutex)->type = thread_mutex_nested_mutex; (*mutex)->type = thread_mutex_nested_mutex;
(*mutex)->handle = CreateMutex(NULL, FALSE, NULL); (*mutex)->handle = CreateMutex(NULL, FALSE, NULL);
} }
#endif #endif
} }
skipping to change at line 89 skipping to change at line 94
return APR_SUCCESS; return APR_SUCCESS;
} }
APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex) APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex)
{ {
if (mutex->type == thread_mutex_critical_section) { if (mutex->type == thread_mutex_critical_section) {
EnterCriticalSection(&mutex->section); EnterCriticalSection(&mutex->section);
} }
else { else {
DWORD rv = WaitForSingleObject(mutex->handle, INFINITE); DWORD rv = WaitForSingleObject(mutex->handle, INFINITE);
if ((rv != WAIT_OBJECT_0) && (rv != WAIT_ABANDONED)) { if ((rv != WAIT_OBJECT_0) && (rv != WAIT_ABANDONED)) {
return (rv == WAIT_TIMEOUT) ? APR_EBUSY : apr_get_os_error(); return (rv == WAIT_TIMEOUT) ? APR_EBUSY : apr_get_os_error();
} }
} }
return APR_SUCCESS; return APR_SUCCESS;
} }
APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex) APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
{ {
if (mutex->type == thread_mutex_critical_section) { if (mutex->type == thread_mutex_critical_section) {
if (!TryEnterCriticalSection(&mutex->section)) { if (!TryEnterCriticalSection(&mutex->section)) {
return APR_EBUSY; return APR_EBUSY;
} }
} }
else { else {
DWORD rv = WaitForSingleObject(mutex->handle, 0); DWORD rv = WaitForSingleObject(mutex->handle, 0);
if ((rv != WAIT_OBJECT_0) && (rv != WAIT_ABANDONED)) { if ((rv != WAIT_OBJECT_0) && (rv != WAIT_ABANDONED)) {
return (rv == WAIT_TIMEOUT) ? APR_EBUSY : apr_get_os_error(); return (rv == WAIT_TIMEOUT) ? APR_EBUSY : apr_get_os_error();
} }
} }
return APR_SUCCESS; return APR_SUCCESS;
} }
APR_DECLARE(apr_status_t) apr_thread_mutex_timedlock(apr_thread_mutex_t *mutex,
apr_interval_time_t timeout)
{
if (mutex->type != thread_mutex_critical_section) {
DWORD rv, timeout_ms = 0;
apr_interval_time_t t = timeout;
do {
if (t > 0) {
/* Given timeout is 64bit usecs whereas Windows timeouts are
* 32bit msecs and below INFINITE (2^32 - 1), so we may need
* multiple timed out waits...
*/
if (t > apr_time_from_msec(INFINITE - 1)) {
timeout_ms = INFINITE - 1;
t -= apr_time_from_msec(INFINITE - 1);
}
else {
timeout_ms = (DWORD)apr_time_as_msec(t);
t = 0;
}
}
rv = WaitForSingleObject(mutex->handle, timeout_ms);
} while (rv == WAIT_TIMEOUT && t > 0);
if ((rv != WAIT_OBJECT_0) && (rv != WAIT_ABANDONED)) {
return (rv == WAIT_TIMEOUT) ? APR_TIMEUP : apr_get_os_error();
}
return APR_SUCCESS;
}
return APR_ENOTIMPL;
}
APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex) APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
{ {
if (mutex->type == thread_mutex_critical_section) { if (mutex->type == thread_mutex_critical_section) {
LeaveCriticalSection(&mutex->section); LeaveCriticalSection(&mutex->section);
} }
else if (mutex->type == thread_mutex_unnested_event) { else if (mutex->type == thread_mutex_unnested_event) {
if (!SetEvent(mutex->handle)) { if (!SetEvent(mutex->handle)) {
return apr_get_os_error(); return apr_get_os_error();
} }
} }
 End of changes. 7 change blocks. 
4 lines changed or deleted 43 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)