From cbb1d818ae96026a873962eb712acad76dd21f72 Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 26 Aug 2008 15:31:13 +0000 Subject: [PATCH] Merged revisions 140053 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r140053 | russell | 2008-08-26 10:29:25 -0500 (Tue, 26 Aug 2008) | 23 lines Merged revisions 140051 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r140051 | russell | 2008-08-26 10:27:23 -0500 (Tue, 26 Aug 2008) | 15 lines Fix a race condition with the IAX scheduler thread. A lock and condition are used here to allow newly scheduled tasks to wake up the scheduler just in case the new task needs to run sooner than the current wakeup time when the thread is sleeping. However, there was a race condition such that a newly scheduled task would not properly wake up the scheduler or affect the wake up period. The order of execution would have been: 1) Scheduler thread determines wake up time of N ms. 2) Another thread schedules a task and signals the condition, with an execution time of < N ms. 3) Scheduler thread locks and goes to sleep for N ms. By moving the sleep time determination to inside the critical section, this possibility is avoided. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@140055 614ede4d-c843-0410-af14-a771ab80d22e --- channels/chan_iax2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index b000561c3..eb7383db3 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -10155,15 +10155,14 @@ static void *sched_thread(void *ignore) struct timespec ts; for (;;) { + pthread_testcancel(); + ast_mutex_lock(&sched_lock); res = ast_sched_wait(sched); if ((res > 1000) || (res < 0)) res = 1000; wait = ast_tvadd(ast_tvnow(), ast_samp2tv(res, 1000)); ts.tv_sec = wait.tv_sec; ts.tv_nsec = wait.tv_usec * 1000; - - pthread_testcancel(); - ast_mutex_lock(&sched_lock); ast_cond_timedwait(&sched_cond, &sched_lock, &ts); ast_mutex_unlock(&sched_lock); pthread_testcancel(); -- 2.11.4.GIT