[svn-commits] tilghman: branch 1.6.2 r190096 - in /branches/1.6.2: ./ include/asterisk/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Apr 22 16:43:30 CDT 2009
Author: tilghman
Date: Wed Apr 22 16:43:25 2009
New Revision: 190096
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190096
Log:
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
........
................
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/configure
branches/1.6.2/configure.ac
branches/1.6.2/include/asterisk/autoconfig.h.in
branches/1.6.2/include/asterisk/lock.h
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/configure.ac?view=diff&rev=190096&r1=190095&r2=190096
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Wed Apr 22 16:43:25 2009
@@ -460,6 +460,24 @@
AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], 1, [Define to 1 if your system defines PTHREAD_MUTEX_RECURSIVE_NP in pthread.h]),
AC_MSG_RESULT(no)
)
+
+AC_MSG_CHECKING(for pthread_rwlock_timedwrlock() in pthread.h)
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [#include <pthread.h>
+ #include <time.h>],
+ [pthread_rwlock_t foo; struct timespec bar; pthread_rwlock_timedwrlock(&foo, &bar)])
+ ],[
+ AC_MSG_RESULT(yes)
+ ac_cv_pthread_rwlock_timedwrlock="yes"
+ ],[
+ AC_MSG_RESULT(no)
+ ac_cv_pthread_rwlock_timedwrlock="no"
+ ]
+)
+if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then
+ AC_DEFINE([HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK], 1, [Define if your system has pthread_rwlock_timedwrlock()])
+fi
AST_C_DEFINE_CHECK([PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP], [PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP], [pthread.h])
Modified: branches/1.6.2/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/include/asterisk/autoconfig.h.in?view=diff&rev=190096&r1=190095&r2=190096
==============================================================================
--- branches/1.6.2/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.2/include/asterisk/autoconfig.h.in Wed Apr 22 16:43:25 2009
@@ -697,6 +697,9 @@
/* Define to 1 if your system defines PTHREAD_RWLOCK_PREFER_WRITER_NP in
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
Modified: branches/1.6.2/include/asterisk/lock.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/include/asterisk/lock.h?view=diff&rev=190096&r1=190095&r2=190096
==============================================================================
--- branches/1.6.2/include/asterisk/lock.h (original)
+++ branches/1.6.2/include/asterisk/lock.h Wed Apr 22 16:43:25 2009
@@ -49,9 +49,14 @@
#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"
@@ -1395,7 +1400,23 @@
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 @@
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_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_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)
More information about the svn-commits
mailing list