kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 48478 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48478 | file | 2006-12-15 01:28:05 -0500 (Fri, 15 Dec 2006) | 2 lines

Use a wakeup variable so that we don't wait on IO indefinitely if packets need to be retransmitted.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-12-15 06:31:26 +00:00
parent 1122621981
commit 315f8bb1b2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_iax2.c
View File

@@ -8098,7 +8098,7 @@ static void *network_thread(void *ignore)
{ {
/* Our job is simple: Send queued messages, retrying if necessary. Read frames /* Our job is simple: Send queued messages, retrying if necessary. Read frames
from the network, and queue them for delivery to the channels */ from the network, and queue them for delivery to the channels */
int res, count; int res, count, wakeup;
struct iax_frame *f; struct iax_frame *f;
if (timingfd > -1) if (timingfd > -1)
@@ -8109,13 +8109,16 @@ static void *network_thread(void *ignore)
sent, and scheduling retransmissions if appropriate */ sent, and scheduling retransmissions if appropriate */
AST_LIST_LOCK(&iaxq.queue); AST_LIST_LOCK(&iaxq.queue);
count = 0; count = 0;
wakeup = -1;
AST_LIST_TRAVERSE_SAFE_BEGIN(&iaxq.queue, f, list) { AST_LIST_TRAVERSE_SAFE_BEGIN(&iaxq.queue, f, list) {
if (f->sentyet) if (f->sentyet)
continue; continue;
/* Try to lock the pvt, if we can't... don't fret - defer it till later */ /* Try to lock the pvt, if we can't... don't fret - defer it till later */
if (ast_mutex_trylock(&iaxsl[f->callno])) if (ast_mutex_trylock(&iaxsl[f->callno])) {
wakeup = 1;
continue; continue;
}
f->sentyet++; f->sentyet++;
@@ -8146,7 +8149,7 @@ static void *network_thread(void *ignore)
ast_log(LOG_DEBUG, "chan_iax2: Sent %d queued outbound frames all at once\n", count); ast_log(LOG_DEBUG, "chan_iax2: Sent %d queued outbound frames all at once\n", count);
/* Now do the IO, and run scheduled tasks */ /* Now do the IO, and run scheduled tasks */
res = ast_io_wait(io, -1); res = ast_io_wait(io, wakeup);
if (res >= 0) { if (res >= 0) {
if (res >= 20 && option_debug) if (res >= 20 && option_debug)
ast_log(LOG_DEBUG, "chan_iax2: ast_io_wait ran %d I/Os all at once\n", res); ast_log(LOG_DEBUG, "chan_iax2: ast_io_wait ran %d I/Os all at once\n", res);