re-do the monitor fix (check for io before killing ourself)
authorJeremy McNamara <jj@nufone.net>
Tue, 6 Jan 2004 17:31:04 +0000 (17:31 +0000)
committerJeremy McNamara <jj@nufone.net>
Tue, 6 Jan 2004 17:31:04 +0000 (17:31 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1892 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_h323.c

index d2cc44e..f0261c9 100755 (executable)
@@ -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);