[asterisk-commits] branch bweschke/gain_functions r14657 - in /team/bweschke/gain_functions: ./ ...

[asterisk-commits at lists.digium.com]

Author: bweschke
Date: Thu Mar 23 19:20:53 2006
New Revision: 14657

URL: http://svn.digium.com/view/asterisk?rev=14657&view=rev
Log:
Merged revisions 14593,14611-14612 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r14593 | kpfleming | 2006-03-23 18:03:21 -0600 (Thu, 23 Mar 2006) | 2 lines

don't treat timeouts as errors in ast_cond_timedwait

........
r14611 | bweschke | 2006-03-23 18:54:27 -0600 (Thu, 23 Mar 2006) | 3 lines

Block r14610 from /trunk as it conflicts with sched.h in /trunk


........
r14612 | bweschke | 2006-03-23 18:55:06 -0600 (Thu, 23 Mar 2006) | 3 lines

 Doxygen typo fix.


........

Modified:
    team/bweschke/gain_functions/   (props changed)
    team/bweschke/gain_functions/include/asterisk/lock.h
    team/bweschke/gain_functions/include/asterisk/sched.h

Propchange: team/bweschke/gain_functions/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/bweschke/gain_functions/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 23 19:20:53 2006
@@ -1,1 +1,1 @@
-/trunk:1-14576
+/trunk:1-14656

Modified: team/bweschke/gain_functions/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/gain_functions/include/asterisk/lock.h?rev=14657&r1=14656&r2=14657&view=diff
==============================================================================
--- team/bweschke/gain_functions/include/asterisk/lock.h (original)
+++ team/bweschke/gain_functions/include/asterisk/lock.h Thu Mar 23 19:20:53 2006
@@ -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 at digium.com>
  *
@@ -468,7 +468,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

Modified: team/bweschke/gain_functions/include/asterisk/sched.h
URL: http://svn.digium.com/view/asterisk/team/bweschke/gain_functions/include/asterisk/sched.h?rev=14657&r1=14656&r2=14657&view=diff
==============================================================================
--- team/bweschke/gain_functions/include/asterisk/sched.h (original)
+++ team/bweschke/gain_functions/include/asterisk/sched.h Thu Mar 23 19:20:53 2006
@@ -72,7 +72,7 @@
 extern int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, void *data);
 
 /*!Adds a scheduled event with rescheduling support
- * \param con Scehduler context to add
+ * \param con Scheduler context to add
  * \param when how many milliseconds to wait for event to occur
  * \param callback function to call when the amount of time expires
  * \param data data to pass to the callback