mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 00:04:53 +00:00
re-do the monitor fix (check for io before killing ourself)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1238,13 +1238,14 @@ restartsearch:
|
||||
}
|
||||
ast_mutex_unlock(&iflock);
|
||||
|
||||
pthread_testcancel();
|
||||
|
||||
/* Wait for sched or io */
|
||||
res = ast_sched_wait(sched);
|
||||
if ((res < 0) || (res > 1000))
|
||||
res = 1000;
|
||||
res = ast_io_wait(io, res);
|
||||
|
||||
pthread_testcancel();
|
||||
|
||||
ast_mutex_lock(&monlock);
|
||||
if (res >= 0)
|
||||
ast_sched_runq(sched);
|
||||
|
Reference in New Issue
Block a user