diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:35:03 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:35:03 +0000 |
commit | 6b7aeb5c1ecb6c590f5e246520793e4fe7547299 (patch) | |
tree | 0eab425211bfc11d7a3ffaba086bd5a35a3a7cf8 /include | |
parent | c6fe6d8afeb05b15b07e8abbebd278704d9ca533 (diff) |
Detect availability of pthread_rwlock_timedwrlock() before using it.
(closes issue #14930)
Reported by: tilghman
Patches:
20090420__bug14930.diff.txt uploaded by tilghman (license 14)
Tested by: mvanbaak, tilghman
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@190092 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
-rw-r--r-- | include/asterisk/lock.h | 73 |
2 files changed, 74 insertions, 2 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index a77ac3fa0..9fddef692 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -313,6 +313,9 @@ /* Define to 1 if your system has PTHREAD_RWLOCK_PREFER_WRITER_NP. */ #undef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP +/* Define if your system has pthread_rwlock_timedwrlock() */ +#undef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK + /* Define to 1 if the system has the type `ptrdiff_t'. */ #undef HAVE_PTRDIFF_T diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 080e502fa..8525e18c5 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -50,6 +50,9 @@ #include <time.h> #include <sys/param.h> +#ifndef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK +#include "asterisk/time.h" +#endif #include "asterisk/logger.h" /* internal macro to profile mutexes. Only computes the delay on @@ -1018,7 +1021,23 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *lock, const char *name, #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock); +#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK res = pthread_rwlock_timedrdlock(lock, abs_timeout); +#else + do { + struct timeval _start = ast_tvnow(), _diff; + for (;;) { + if (!(res = pthread_rwlock_tryrdlock(&t->lock))) { + break; + } + _diff = ast_tvsub(ast_tvnow(), _start); + if (_diff.tv_sec > abs_timeout->tv_sec || (_diff.tv_sec == abs_timeout->tv_sec && _diff.tv_usec * 1000 > abs_timeout->tv_nsec)) { + break; + } + usleep(1); + } + } while (0); +#endif if (!res) ast_mark_lock_acquired(lock); else @@ -1051,7 +1070,23 @@ static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *lock, const char *name, #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */ ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock); +#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK res = pthread_rwlock_timedwrlock(lock, abs_timeout); +#else + do { + struct timeval _start = ast_tvnow(), _diff; + for (;;) { + if (!(res = pthread_rwlock_trywrlock(&t->lock))) { + break; + } + _diff = ast_tvsub(ast_tvnow(), _start); + if (_diff.tv_sec > abs_timeout->tv_sec || (_diff.tv_sec == abs_timeout->tv_sec && _diff.tv_usec * 1000 > abs_timeout->tv_nsec)) { + break; + } + usleep(1); + } + } while (0); +#endif if (!res) ast_mark_lock_acquired(lock); else @@ -1160,7 +1195,23 @@ static inline int ast_rwlock_rdlock(ast_rwlock_t *prwlock) static inline int ast_rwlock_timedrdlock(ast_rwlock_t *prwlock, const struct timespec *abs_timeout) { - return pthread_rwlock_timedrdlock(prwlock, abs_timeout); + int res; +#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK + res = pthread_rwlock_timedrdlock(prwlock, abs_timeout); +#else + struct timeval _start = ast_tvnow(), _diff; + for (;;) { + if (!(res = pthread_rwlock_tryrdlock(prwlock))) { + break; + } + _diff = ast_tvsub(ast_tvnow(), _start); + if (_diff.tv_sec > abs_timeout->tv_sec || (_diff.tv_sec == abs_timeout->tv_sec && _diff.tv_usec * 1000 > abs_timeout->tv_nsec)) { + break; + } + usleep(1); + } +#endif + return res; } static inline int ast_rwlock_tryrdlock(ast_rwlock_t *prwlock) @@ -1175,7 +1226,25 @@ static inline int ast_rwlock_wrlock(ast_rwlock_t *prwlock) static inline int ast_rwlock_timedwrlock(ast_rwlock_t *prwlock, const struct timespec *abs_timeout) { - return pthread_rwlock_timedwrlock(prwlock, abs_timeout); + int res; +#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK + res = pthread_rwlock_timedwrlock(prwlock, abs_timeout); +#else + do { + struct timeval _start = ast_tvnow(), _diff; + for (;;) { + if (!(res = pthread_rwlock_trywrlock(prwlock))) { + break; + } + _diff = ast_tvsub(ast_tvnow(), _start); + if (_diff.tv_sec > abs_timeout->tv_sec || (_diff.tv_sec == abs_timeout->tv_sec && _diff.tv_usec * 1000 > abs_timeout->tv_nsec)) { + break; + } + usleep(1); + } + } while (0); +#endif + return res; } static inline int ast_rwlock_trywrlock(ast_rwlock_t *prwlock) |