kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-06 18:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-do the monitor fix (check for io before killing ourself)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2004-01-06 17:31:04 +00:00
parent c3b8ab76a5
commit 9697652c0a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_h323.c
View File

@@ -1238,13 +1238,14 @@ restartsearch:
} }
ast_mutex_unlock(&iflock); ast_mutex_unlock(&iflock);
pthread_testcancel();
/* Wait for sched or io */ /* Wait for sched or io */
res = ast_sched_wait(sched); res = ast_sched_wait(sched);
if ((res < 0) || (res > 1000)) if ((res < 0) || (res > 1000))
res = 1000; res = 1000;
res = ast_io_wait(io, res); res = ast_io_wait(io, res);
pthread_testcancel();
ast_mutex_lock(&monlock); ast_mutex_lock(&monlock);
if (res >= 0) if (res >= 0)
ast_sched_runq(sched); ast_sched_runq(sched);