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

Merge of timedwrlock detection broke build.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-04-23 22:21:06 +00:00
parent a92f2e2a77
commit 08c9634115
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asterisk/lock.h
View File

@@ -1047,12 +1047,12 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *lock, const char *name,
ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock); ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock);
#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK #ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK
res = pthread_rwlock_timedrdlock(&t->lock, abs_timeout); res = pthread_rwlock_timedrdlock(lock, abs_timeout);
#else #else
do { do {
struct timeval _start = ast_tvnow(), _diff; struct timeval _start = ast_tvnow(), _diff;
for (;;) { for (;;) {
if (!(res = pthread_rwlock_tryrdlock(&t->lock))) { if (!(res = pthread_rwlock_tryrdlock(lock))) {
break; break;
} }
_diff = ast_tvsub(ast_tvnow(), _start); _diff = ast_tvsub(ast_tvnow(), _start);
@@ -1093,12 +1093,12 @@ static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *lock, const char *name,
ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock); ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock);
#ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK #ifdef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK
res = pthread_rwlock_timedwrlock(&t->lock, abs_timeout); res = pthread_rwlock_timedwrlock(lock, abs_timeout);
#else #else
do { do {
struct timeval _start = ast_tvnow(), _diff; struct timeval _start = ast_tvnow(), _diff;
for (;;) { for (;;) {
if (!(res = pthread_rwlock_trywrlock(&t->lock))) { if (!(res = pthread_rwlock_trywrlock(lock))) {
break; break;
} }
_diff = ast_tvsub(ast_tvnow(), _start); _diff = ast_tvsub(ast_tvnow(), _start);