kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 190093 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-04-22 21:41:24 +00:00
parent 62f5546319
commit 94b71d104f
4 changed files with 161 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/asterisk/autoconfig.h.in
View File

@@ -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

79
include/asterisk/lock.h
View File

@@ -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)