diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:38:15 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:38:15 +0000 |
commit | d2970d26d050ece2c790d757abe4113616550ad2 (patch) | |
tree | ecd965e8306d153418e7923c7c041cf2cb71b7d9 /include | |
parent | f3943d366244e247fb3b22ef50c291b64b9709c5 (diff) |
Merged revisions 190092 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r190092 | tilghman | 2009-04-22 16:35:03 -0500 (Wed, 22 Apr 2009) | 7 lines
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/trunk@190093 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 | 75 |
2 files changed, 76 insertions, 2 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 50ef2fa50..57987139f 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -716,6 +716,9 @@ pthread.h */ #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 bba20c85d..1bd300e40 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -49,10 +49,15 @@ #define _ASTERISK_LOCK_H #include <pthread.h> +#include <time.h> #include <sys/param.h> #ifdef HAVE_BKTR #include <execinfo.h> #endif + +#ifndef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK +#include "asterisk/time.h" +#endif #include "asterisk/logger.h" /* internal macro to profile mutexes. Only computes the delay on @@ -1395,7 +1400,23 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name, ast_store_lock_info(AST_WRLOCK, filename, line, func, name, t); #endif } +#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK res = pthread_rwlock_timedrdlock(&t->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_reentrancy_lock(lt); if (lt->reentrancy < AST_MAX_REENTRANCY) { @@ -1474,7 +1495,23 @@ static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name, ast_store_lock_info(AST_WRLOCK, filename, line, func, name, t); #endif } +#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK res = pthread_rwlock_timedwrlock(&t->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_reentrancy_lock(lt); if (lt->reentrancy < AST_MAX_REENTRANCY) { @@ -1762,7 +1799,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) @@ -1777,7 +1830,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) |