VG_(read_millisecond_timer)() is now monotonic, even if set_timeofday() is called...

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

diff --git a/coregrind/m_libcproc.c b/coregrind/m_libcproc.c
index 3117f96a797de2a8decfcbf4c121c96d31c2c372..cd3d771214b08c696906754929470a16b42ed48d 100644 (file)
--- a/coregrind/m_libcproc.c
+++ b/coregrind/m_libcproc.c
@@ -541,10 +541,21 @@ UInt VG_(read_millisecond_timer) ( void )
    now += (ULong)(nsec / 1000);
 #  else
 
-   struct vki_timeval tv_now;
+   struct vki_timespec ts_now;
    SysRes res;
-   res = VG_(do_syscall2)(__NR_gettimeofday, (UWord)&tv_now, (UWord)NULL);
-   now = tv_now.tv_sec * 1000000ULL + tv_now.tv_usec;
+   res = VG_(do_syscall2)(__NR_clock_gettime, VKI_CLOCK_MONOTONIC,
+                          (UWord)&ts_now);
+   if (res.isError == 0)
+   {
+     now = ts_now.tv_sec * 1000000ULL + ts_now.tv_nsec / 1000;
+   }
+   else
+   {
+     struct vki_timeval tv_now;
+     res = VG_(do_syscall2)(__NR_gettimeofday, (UWord)&tv_now, (UWord)NULL);
+     vg_assert(! res.isError);
+     now = tv_now.tv_sec * 1000000ULL + tv_now.tv_usec;
+   }
 #  endif
    
    if (base == 0)