Changeset 22957 in vbox

Timestamp:

Sep 11, 2009 1:04:19 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/semmutex: fix timeout handling like in semevent

File:

• trunk/src/VBox/Runtime/r3/linux/semmutex-linux.cpp (modified) (2 diffs)

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

@@ -173 +173 @@
     struct timespec ts;
     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;
+        u64End = RTTimeSystemNanoTS() + cMillies * 1000000;
         pTimeout = &ts;
     }
@@ -226 +228 @@
                 return RTErrConvertFromErrno(rc);
             }
+
+            /* adjust the relative timeout */
+            if (pTimeout)
+            {
+                int64_t u64Diff = u64End - RTTimeSystemNanoTS();
+                if (u64Diff < 1000)
+                {
+                    rc = VERR_TIMEOUT;
+                    break;
+                }
+                ts.tv_sec  = u64Diff / 1000000000;
+                ts.tv_nsec = u64Diff % 1000000000;
+            }
         }