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 4aa252d4ae61b952bcee70dceddc614fa6ca81e7..6bab98802b6b878a647d2be28b910d4050e49c6e 100644 (file)
--- 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));