diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 17:58:31 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 17:58:31 +0000 |
| commit | 239eceb889bc4f7c157ec21138e027219234543e (patch) | |
| tree | f0b761de5be6d93ae6b3281a5939506f7e802d79 /include | |
| parent | e20013c60f1e5aaf0693b6baa295f387fd120b04 (diff) | |
Properly handle an ETIMEDOUT result from pthread_cond_timedwait (issue #7318 reported by arkadia)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@41390 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index cf9549751..dc9cf9a28 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -485,7 +485,7 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c t->thread[t->reentrancy] = 0; } - if ((res = pthread_cond_timedwait(cond, &t->mutex, abstime))) { + if ((res = pthread_cond_timedwait(cond, &t->mutex, abstime)) && (res != ETIMEDOUT)) { __ast_mutex_logger("%s line %d (%s): Error waiting on condition mutex '%s'\n", filename, lineno, func, strerror(res)); #ifdef THREAD_CRASH |