[asterisk-commits] file: branch 1.2 r41390 - /branches/1.2/include/asterisk/lock.h

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Aug 30 12:58:31 2006
New Revision: 41390

URL: http://svn.digium.com/view/asterisk?rev=41390&view=rev
Log:
Properly handle an ETIMEDOUT result from pthread_cond_timedwait (issue #7318 reported by arkadia)

Modified:
    branches/1.2/include/asterisk/lock.h

Modified: branches/1.2/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/branches/1.2/include/asterisk/lock.h?rev=41390&r1=41389&r2=41390&view=diff
==============================================================================
--- branches/1.2/include/asterisk/lock.h (original)
+++ branches/1.2/include/asterisk/lock.h Wed Aug 30 12:58:31 2006
@@ -485,7 +485,7 @@
 		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