Changeset 25650 in vbox

Timestamp:

Jan 5, 2010 2:43:53 PM (15 years ago)

Author:

vboxsync

Message:

semevent-linux.cpp: Fixed bug in rtSemEventWait when calculating u64End for timeouts larger than 4294 ms, the effective timeout was truncated <= 4294 ms.

File:

• trunk/src/VBox/Runtime/r3/linux/semevent-linux.cpp (modified) (3 diffs)

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

@@ -30 +30 @@
 
 #include <features.h>
-#if __GLIBC_PREREQ(2,6) && !defined(IPRT_WITH_FUTEX_BASED_SEMS)
+#if __GLIBC_PREREQ(2,6) && !defined(IPRT_WITH_FUTEX_BASED_SEMS) && !defined(DEBUG_bird)
 
 /*
@@ -238 +238 @@
             return VERR_TIMEOUT;
         ts.tv_sec  = cMillies / 1000;
-        ts.tv_nsec = (cMillies % 1000) * 1000000;
-        u64End = RTTimeSystemNanoTS() + cMillies * 1000000;
+        ts.tv_nsec = (cMillies % 1000) * UINT32_C(1000000);
+        u64End = RTTimeSystemNanoTS() + cMillies * UINT64_C(1000000);
         pTimeout = &ts;
     }
@@ -309 +309 @@
                 break;
             }
-            ts.tv_sec  = i64Diff / 1000000000;
-            ts.tv_nsec = i64Diff % 1000000000;
+            ts.tv_sec  = (uint64_t)i64Diff / UINT32_C(1000000000);
+            ts.tv_nsec = (uint64_t)i64Diff % UINT32_C(1000000000);
         }
     }