diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-03-24 00:03:21 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-03-24 00:03:21 +0000 |
commit | 322f53d8b8bbf72e412575df93f4cf263ccc9329 (patch) | |
tree | 5df59bc1be736060ab3d66acb631ac99e450563a | |
parent | c26786fd81515ee0179135bae2c00df4f07e6aec (diff) |
don't treat timeouts as errors in ast_cond_timedwait
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | include/asterisk/lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index e1562e5e0..53c56a544 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -468,7 +468,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 |