Properly handle an ETIMEDOUT result from pthread_cond_timedwait (issue #7318 reported by arkadia)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@41390 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2
Joshua Colp 20 years ago
parent 955aa04edc
commit 6b466228c4

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

Loading…
Cancel
Save