diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:41:24 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:41:24 +0000 |
commit | b11dd20fa77998d8677f419fe37532efacd22827 (patch) | |
tree | 7f6092b2a8709f93a0ec7f9da80804c50aff7b86 /include | |
parent | 32e8acd7cfed3e30d7e655ede7b2114e6b2db035 (diff) |
Merged revisions 190093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r190093 | tilghman | 2009-04-22 16:38:15 -0500 (Wed, 22 Apr 2009) | 14 lines
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/branches/1.6.0@190094 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 | 79 |
2 files changed, 78 insertions, 4 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index e3ea2f754..c8b88a554 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -637,6 +637,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 1278a6aa7..961f3a294 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -49,8 +49,13 @@ #define _ASTERISK_LOCK_H #include <pthread.h> +#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 @@ -1041,7 +1046,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); - res = pthread_rwlock_timedrdlock(lock, abs_timeout); +#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_mark_lock_acquired(lock); else @@ -1071,7 +1092,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); - res = pthread_rwlock_timedwrlock(lock, abs_timeout); +#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_mark_lock_acquired(lock); else @@ -1185,7 +1222,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) @@ -1200,7 +1253,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) |