From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Sep 2004 18:55:55 +0000 (+0000)
Subject: Fix conversion of timeval to milliseconds - tv_usec is microseconds
X-Git-Tag: svn/VALGRIND_3_0_0~1562
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18ee5b49cb0a601cb0f38f23766e6b04fd60d557;p=thirdparty%2Fvalgrind.git

Fix conversion of timeval to milliseconds - tv_usec is microseconds
and not nanoseconds.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2726
---

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 4aa252d4ae..6bab98802b 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -1477,7 +1477,7 @@ int pthread_cond_timedwait ( pthread_cond_t *cond,
 
    ull_ms_now_after_1970 
       = 1000ULL * ((unsigned long long int)(timeval_now.tv_sec))
-        + ((unsigned long long int)(timeval_now.tv_usec / 1000000));
+        + ((unsigned long long int)(timeval_now.tv_usec / 1000));
    ull_ms_end_after_1970
       = 1000ULL * ((unsigned long long int)(abstime->tv_sec))
         + ((unsigned long long int)(abstime->tv_nsec / 1000000));