kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-27 02:44:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-12-15 06:28:05 +00:00
parent 0995fb8aeb
commit 3706ecbbc5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+6 -3
View File
@@ -8009,7 +8009,7 @@ static void *network_thread(void *ignore)
{
/* Our job is simple: Send queued messages, retrying if necessary. Read frames
from the network, and queue them for delivery to the channels */
int res, count;
int res, count, wakeup;
struct iax_frame *f;
if (timingfd > -1)
@@ -8020,13 +8020,16 @@ static void *network_thread(void *ignore)
sent, and scheduling retransmissions if appropriate */
AST_LIST_LOCK(&iaxq.queue);
count = 0;
wakeup = -1;
AST_LIST_TRAVERSE_SAFE_BEGIN(&iaxq.queue, f, list) {
if (f->sentyet)
continue;
/* 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;
}
f->sentyet++;
@@ -8057,7 +8060,7 @@ static void *network_thread(void *ignore)
ast_log(LOG_DEBUG, "chan_iax2: Sent %d queued outbound frames all at once\n", count);
/* 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 >= 20)
ast_log(LOG_DEBUG, "chan_iax2: ast_io_wait ran %d I/Os all at once\n", res);