Changeset 22956 in vbox

Timestamp:

Sep 11, 2009 12:55:18 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/semevent: clock_gettime(CLOCK_REALTIME) => RTTimeSystemNanoTS

Location:

trunk/src/VBox/Runtime/r3/linux

Files:

• semevent-linux.cpp (modified) (3 diffs)
• semeventmulti-linux.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/linux/semevent-linux.cpp

@@ -54 +54 @@
 #include <iprt/asm.h>
 #include <iprt/err.h>
+#include <iprt/time.h>
 #include "internal/magics.h"
 
@@ -197 +198 @@
      */
     struct timespec ts;
-    struct timespec tsEnd;
     struct timespec *pTimeout = NULL;
+    uint64_t u64End = 0; /* shut up gcc */
     if (cMillies != RT_INDEFINITE_WAIT)
     {
         ts.tv_sec  = cMillies / 1000;
         ts.tv_nsec = (cMillies % 1000) * 1000000;
-        clock_gettime(CLOCK_REALTIME, &tsEnd);
-        tsEnd.tv_sec  += ts.tv_sec;
-        tsEnd.tv_nsec += ts.tv_nsec;
-        if (tsEnd.tv_nsec >= 1000000000)
-        {
-            tsEnd.tv_nsec -= 1000000000;
-            tsEnd.tv_sec++;
-        }
+        u64End = RTTimeSystemNanoTS() + cMillies * 1000000;
         pTimeout = &ts;
     }
@@ -258 +252 @@
         if (pTimeout)
         {
-            clock_gettime(CLOCK_REALTIME, &ts);
-            ts.tv_nsec = tsEnd.tv_nsec - ts.tv_nsec;
-            ts.tv_sec  = tsEnd.tv_sec - ts.tv_sec;
-            if (ts.tv_nsec < 0)
-            {
-                ts.tv_nsec += 1000000000; /* not correct if ts.tv_sec is negative but we
-                                             leave on negative timeouts in any case */
-                ts.tv_sec--;
-            }
-            /* don't wait for less than 1 microsecond */
-            if (   ts.tv_sec < 0
-                || (ts.tv_sec == 0 && ts.tv_nsec < 1000))
+            int64_t u64Diff = u64End - RTTimeSystemNanoTS();
+            if (u64Diff < 1000)
             {
                 rc = VERR_TIMEOUT;
                 break;
             }
+            ts.tv_sec  = u64Diff / 1000000000;
+            ts.tv_nsec = u64Diff % 1000000000;
         }
     }

trunk/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp

@@ -56 +56 @@
 #include <iprt/asm.h>
 #include <iprt/err.h>
+#include <iprt/time.h>
 #include "internal/magics.h"
 
@@ -218 +219 @@
      */
     struct timespec ts;
-    struct timespec tsEnd;
     struct timespec *pTimeout = NULL;
+    uint64_t u64End = 0; /* shut up gcc */
     if (cMillies != RT_INDEFINITE_WAIT)
     {
         ts.tv_sec  = cMillies / 1000;
         ts.tv_nsec = (cMillies % 1000) * 1000000;
-        clock_gettime(CLOCK_REALTIME, &tsEnd);
-        tsEnd.tv_sec  += ts.tv_sec;
-        tsEnd.tv_nsec += ts.tv_nsec;
-        if (tsEnd.tv_nsec >= 1000000000)
-        {
-            tsEnd.tv_nsec -= 1000000000;
-            tsEnd.tv_sec++;
-        }
+        u64End = RTTimeSystemNanoTS() + cMillies * 1000000;
         pTimeout = &ts;
     }
@@ -252 +246 @@
             if (pTimeout)
             {
-                clock_gettime(CLOCK_REALTIME, &ts);
-                ts.tv_nsec = tsEnd.tv_nsec - ts.tv_nsec;
-                ts.tv_sec  = tsEnd.tv_sec - ts.tv_sec;
-                if (ts.tv_nsec < 0)
-                {
-                    ts.tv_nsec += 1000000000; /* not correct if ts.tv_sec is negative but we
-                                                 leave on negative timeouts in any case */
-                    ts.tv_sec--;
-                }
-                /* don't wait for less than 1 microsecond */
-                if (   ts.tv_sec < 0
-                    || (ts.tv_sec == 0 && ts.tv_nsec < 1000))
+                int64_t u64Diff = u64End - RTTimeSystemNanoTS();
+                if (u64Diff < 1000)
                     return VERR_TIMEOUT;
+                ts.tv_sec  = u64Diff / 1000000000;
+                ts.tv_nsec = u64Diff % 1000000000;
             }
             long rc = sys_futex(&pThis->iState, FUTEX_WAIT, 1, pTimeout, NULL, 0);