Changeset 29914 in vbox for trunk/src

Timestamp:

May 31, 2010 2:53:33 PM (15 years ago)

Author:

vboxsync

Message:

ProgressImpl.cpp: Use RTTimeMillTS instead of RTTimeNow() - monotonic vs. wall time.

File:

• trunk/src/VBox/Main/ProgressImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -835 +835 @@
     if (!mCompleted)
     {
-        RTTIMESPEC time;
-        RTTimeNow(&time); /** @todo r=bird: Use monotonic time (RTTimeMilliTS()) here because of daylight saving and things like that. */
-
         int vrc = VINF_SUCCESS;
         bool fForever = aTimeout < 0;
         int64_t timeLeft = aTimeout;
-        int64_t lastTime = RTTimeSpecGetMilli(&time);
+        int64_t lastTime = RTTimeMilliTS();
 
         while (!mCompleted && (fForever || timeLeft > 0))
@@ -848 +845 @@
             alock.leave();
             vrc = RTSemEventMultiWait(mCompletedSem,
-                                      fForever ? RT_INDEFINITE_WAIT : (unsigned)timeLeft);
+                                      fForever ? RT_INDEFINITE_WAIT : (RTMSINTERVAL)timeLeft);
             alock.enter();
             mWaitersCount--;
@@ -861 +858 @@
             if (!fForever)
             {
-                RTTimeNow (&time);
-                timeLeft -= RTTimeSpecGetMilli(&time) - lastTime;
-                lastTime = RTTimeSpecGetMilli(&time);
+                int64_t now = RTTimeMilliTS();
+                timeLeft -= now - lastTime;
+                lastTime = now;
             }
         }
@@ -901 +898 @@
          && aOperation >= m_ulCurrentOperation)
     {
-        RTTIMESPEC time;
-        RTTimeNow (&time);
-
         int vrc = VINF_SUCCESS;
         bool fForever = aTimeout < 0;
         int64_t timeLeft = aTimeout;
-        int64_t lastTime = RTTimeSpecGetMilli (&time);
+        int64_t lastTime = RTTimeMilliTS();
 
         while (    !mCompleted && aOperation >= m_ulCurrentOperation
@@ -928 +922 @@
             if (!fForever)
             {
-                RTTimeNow(&time);
-                timeLeft -= RTTimeSpecGetMilli(&time) - lastTime;
-                lastTime = RTTimeSpecGetMilli(&time);
+                int64_t now = RTTimeMilliTS();
+                timeLeft -= now - lastTime;
+                lastTime = now;
             }
         }
@@ -1592 +1586 @@
     if (!mCompleted)
     {
-        RTTIMESPEC time;
-        RTTimeNow(&time);
-
         HRESULT rc = S_OK;
         bool forever = aTimeout < 0;
         int64_t timeLeft = aTimeout;
-        int64_t lastTime = RTTimeSpecGetMilli(&time);
+        int64_t lastTime = RTTimeMilliTS();
 
         while (!mCompleted && (forever || timeLeft > 0))
@@ -1613 +1604 @@
             if (!forever)
             {
-                RTTimeNow(&time);
-                timeLeft -= RTTimeSpecGetMilli(&time) - lastTime;
-                lastTime = RTTimeSpecGetMilli(&time);
+                int64_t now = RTTimeMilliTS();
+                timeLeft -= now - lastTime;
+                lastTime = now;
             }
         }
@@ -1679 +1670 @@
                           progress, operation));
 
-        RTTIMESPEC time;
-        RTTimeNow (&time);
-
         bool forever = aTimeout < 0;
         int64_t timeLeft = aTimeout;
-        int64_t lastTime = RTTimeSpecGetMilli (&time);
+        int64_t lastTime = RTTimeMilliTS();
 
         while (!mCompleted && aOperation >= m_ulCurrentOperation &&
@@ -1702 +1690 @@
             if (!forever)
             {
-                RTTimeNow(&time);
-                timeLeft -= RTTimeSpecGetMilli(&time) - lastTime;
-                lastTime = RTTimeSpecGetMilli(&time);
+                int64_t now = RTTimeMilliTS();
+                timeLeft -= now - lastTime;
+                lastTime = now;
             }
         }