"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "locks/unix/global_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).

global_mutex.c  (apr-1.6.5.tar.bz2)	:	global_mutex.c  (apr-1.7.0.tar.bz2)
skipping to change at line 145		skipping to change at line 145
if (rv != APR_SUCCESS) {		if (rv != APR_SUCCESS) {
if (mutex->thread_mutex) {		if (mutex->thread_mutex) {
(void)apr_thread_mutex_unlock(mutex->thread_mutex);		(void)apr_thread_mutex_unlock(mutex->thread_mutex);
}		}
}		}
#endif /* APR_HAS_THREADS */		#endif /* APR_HAS_THREADS */
return rv;		return rv;
}		}
		APR_DECLARE(apr_status_t) apr_global_mutex_timedlock(apr_global_mutex_t *mutex,
		apr_interval_time_t timeout)
		{
		#if APR_HAS_TIMEDLOCKS
		apr_status_t rv;
		#if APR_HAS_THREADS
		if (mutex->thread_mutex) {
		apr_time_t expiry = 0;
		if (timeout > 0) {
		expiry = apr_time_now() + timeout;
		}
		rv = apr_thread_mutex_timedlock(mutex->thread_mutex, timeout);
		if (rv != APR_SUCCESS) {
		return rv;
		}
		if (expiry) {
		timeout = expiry - apr_time_now();
		if (timeout < 0) {
		timeout = 0;
		}
		}
		}
		#endif /* APR_HAS_THREADS */
		rv = apr_proc_mutex_timedlock(mutex->proc_mutex, timeout);
		#if APR_HAS_THREADS
		if (rv != APR_SUCCESS) {
		if (mutex->thread_mutex) {
		(void)apr_thread_mutex_unlock(mutex->thread_mutex);
		}
		}
		#endif /* APR_HAS_THREADS */
		return rv;
		#else /* APR_HAS_TIMEDLOCKS */
		return APR_ENOTIMPL;
		#endif
		}
APR_DECLARE(apr_status_t) apr_global_mutex_unlock(apr_global_mutex_t *mutex)		APR_DECLARE(apr_status_t) apr_global_mutex_unlock(apr_global_mutex_t *mutex)
{		{
apr_status_t rv;		apr_status_t rv;
rv = apr_proc_mutex_unlock(mutex->proc_mutex);		rv = apr_proc_mutex_unlock(mutex->proc_mutex);
#if APR_HAS_THREADS		#if APR_HAS_THREADS
if (mutex->thread_mutex) {		if (mutex->thread_mutex) {
if (rv != APR_SUCCESS) {		if (rv != APR_SUCCESS) {
(void)apr_thread_mutex_unlock(mutex->thread_mutex);		(void)apr_thread_mutex_unlock(mutex->thread_mutex);
}		}
End of changes. 1 change blocks.
0 lines changed or deleted		41 lines changed or added

---