Changeset 22954 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

Runtime/semevent: stupid typos; no RT_UNLIKELY

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

@@ -30 +30 @@
 
 #include <features.h>
-#if __GLIBC_PREREQ(2,6)
+#if __GLIBC_PREREQ(2,6) && 0
 
 /*
@@ -199 +199 @@
     struct timespec tsEnd;
     struct timespec *pTimeout = NULL;
-    if (RT_UNLIKELY(cMillies != RT_INDEFINITE_WAIT))
+    if (cMillies != RT_INDEFINITE_WAIT)
     {
         ts.tv_sec  = cMillies / 1000;
@@ -256 +256 @@
         }
         /* adjust the relative timeout */
-        if (RT_UNLIKELY(pTimeout))
+        if (pTimeout)
         {
             clock_gettime(CLOCK_REALTIME, &ts);
             ts.tv_nsec = tsEnd.tv_nsec - ts.tv_nsec;
-            ts.tv_sec  = tsEnd.tv_nsec - ts.tv_sec;
+            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_nsec--;
+                ts.tv_sec--;
             }
             /* don't wait for less than 1 microsecond */

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

@@ -31 +31 @@
 
 #include <features.h>
-#if __GLIBC_PREREQ(2,6)
+#if __GLIBC_PREREQ(2,6) && 0
 
 /*
@@ -220 +220 @@
     struct timespec tsEnd;
     struct timespec *pTimeout = NULL;
-    if (RT_UNLIKELY(cMillies != RT_INDEFINITE_WAIT))
+    if (cMillies != RT_INDEFINITE_WAIT)
     {
         ts.tv_sec  = cMillies / 1000;
@@ -250 +250 @@
         {
             /* adjust the relative timeout */
-            if (RT_UNLIKELY(pTimeout))
+            if (pTimeout)
             {
                 clock_gettime(CLOCK_REALTIME, &ts);
                 ts.tv_nsec = tsEnd.tv_nsec - ts.tv_nsec;
-                ts.tv_sec  = tsEnd.tv_nsec - ts.tv_sec;
+                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_nsec--;
+                    ts.tv_sec--;
                 }
                 /* don't wait for less than 1 microsecond */