Merged revisions 42260 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 7 Sep 2006 16:33:02 +0000 (16:33 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 7 Sep 2006 16:33:02 +0000 (16:33 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42260 | file | 2006-09-07 12:30:44 -0400 (Thu, 07 Sep 2006) | 2 lines

Let's use the same thing we use in other places to calculate our time for ast_cond_timedwait (issue #7697 reported by bn999)

........

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

main/cdr.c

index 04d7ea8..19163cf 100644 (file)
@@ -945,13 +945,14 @@ static void *do_cdr(void *data)
        int numevents = 0;
 
        for(;;) {
-               struct timeval now = ast_tvnow();
+               struct timeval now;
                schedms = ast_sched_wait(sched);
                /* this shouldn't happen, but provide a 1 second default just in case */
                if (schedms <= 0)
                        schedms = 1000;
-               timeout.tv_sec = now.tv_sec + (schedms / 1000);
-               timeout.tv_nsec = (now.tv_usec * 1000) + ((schedms % 1000) * 1000);
+               now = ast_tvadd(ast_tvnow(), ast_samp2tv(schedms, 1000));
+               timeout.tv_sec = now.tv_sec;
+               timeout.tv_nsec = now.tv_usec * 1000;
                /* prevent stuff from clobbering cdr_pending_cond, then wait on signals sent to it until the timeout expires */
                ast_mutex_lock(&cdr_pending_lock);
                ast_cond_timedwait(&cdr_pending_cond, &cdr_pending_lock, &timeout);