From: Kevin P. Fleming <kpfleming@digium.com>
Date: Thu, 23 Mar 2006 23:57:18 +0000 (+0000)
Subject: compute scheduler thread timeout properly
X-Git-Tag: 1.4.0-beta1~2343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c26786fd81515ee0179135bae2c00df4f07e6aec;p=thirdparty%2Fasterisk.git

compute scheduler thread timeout properly


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 042dbf4b17..d8995c696d 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -8264,13 +8264,16 @@ static void *sched_thread(void *ignore)
 {
 	int count;
 	int res;
+	struct timeval tv;
 	struct timespec ts;
 
 	for (;;) {
 		res = ast_sched_wait(sched);
 		if ((res > 1000) || (res < 0))
 			res = 1000;
-		ts.tv_sec = res;
+		tv = ast_tvadd(ast_tvnow(), ast_samp2tv(res, 1000));
+		ts.tv_sec = tv.tv_sec;
+		ts.tv_nsec = tv.tv_usec * 1000;
 
 		ast_mutex_lock(&sched_lock);
 		ast_cond_timedwait(&sched_cond, &sched_lock, &ts);