From: Kevin P. Fleming <kpfleming@digium.com>
Date: Fri, 24 Mar 2006 00:03:21 +0000 (+0000)
Subject: don't treat timeouts as errors in ast_cond_timedwait
X-Git-Tag: 1.4.0-beta1~2342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=322f53d8b8bbf72e412575df93f4cf263ccc9329;p=thirdparty%2Fasterisk.git

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

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index e1562e5e0a..53c56a5442 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