Idefisk
Tools
Tutorials
Reviews
VoIP Providers
Archives
AsteriskGuru Archives
Mailing List Archives
FAQ
Search
Memberlist
Usergroups
Register
Profile
Log in to check your private messages
Log in
[svn-commits] russell: branch 1.6.2 r198185 - in /branches/1
AsteriskGuru Archives Forum Index
->
Asterisk-CVS
View previous topic
::
View next topic
Author
Message
svn-commits at lists.digi
Guest
Posted: Fri May 29, 2009 9:42 pm
Post subject: [svn-commits] russell: branch 1.6.2 r198185 - in /branches/1
Author: russell
Date: Fri May 29 17:35:14 2009
New Revision: 198185
URL:
http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198185
Log:
Merged revisions 198183 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r198183 | russell | 2009-05-29 17:33:31 -0500 (Fri, 29 May 2009) | 2 lines
Improve handling of trying to ACK too many timer expirations.
........
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/res/res_timing_pthread.c
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/res/res_timing_pthread.c
URL:
http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/res/res_timing_pthread.c?view=diff&rev=198185&r1=198184&r2=198185
==============================================================================
--- branches/1.6.2/res/res_timing_pthread.c (original)
+++ branches/1.6.2/res/res_timing_pthread.c Fri May 29 17:35:14 2009
@@ -357,9 +357,21 @@
static void read_pipe(struct pthread_timer *timer, unsigned int quantity)
{
int rd_fd = timer->pipe[PIPE_READ];
+ int pending_ticks = timer->pending_ticks;
ast_assert(quantity);
- ast_assert(quantity >= timer->pending_ticks);
+
+ if (timer->continuous && pending_ticks) {
+ pending_ticks--;
+ }
+
+ if (quantity > pending_ticks) {
+ quantity = pending_ticks;
+ }
+
+ if (!quantity) {
+ return;
+ }
do {
unsigned char buf[1024];
_______________________________________________
--Bandwidth and Colocation Provided by
http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
Back to top
Display posts from previous:
All Posts
1 Day
7 Days
2 Weeks
1 Month
3 Months
6 Months
1 Year
Oldest First
Newest First
AsteriskGuru Archives Forum Index
->
Asterisk-CVS
All times are GMT
Page
1
of
1
Jump to:
Select a forum
Asterisk Mailing Lists
----------------
Asterisk-Users
Asterisk-Dev
Asterisk-CVS
Asterisk-Biz
Asterisk-Doc
Asterisk-BSD
Asterisk-Announce
Asterisk Call Centers
Asterisk-Video
Asterisk-Speech-Rec
Bristuff-Users
You
cannot
post new topics in this forum
You
cannot
reply to topics in this forum
You
cannot
edit your posts in this forum
You
cannot
delete your posts in this forum
You
cannot
vote in polls in this forum
Powered by
phpBB
© 2001, 2005 phpBB Group