Changeset 22952 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Runtime/semevent: Fix part II for the Linux-specific RTSemEvent* implementation (adjusting the relative timeout)

Location:

trunk/src/VBox/Runtime/r3/linux

Files:

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

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

@@ -197 +197 @@
      */
     struct timespec ts;
+    struct timespec tsEnd;
     struct timespec *pTimeout = NULL;
-    if (cMillies != RT_INDEFINITE_WAIT)
+    if (RT_UNLIKELY(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++;
+        }
         pTimeout = &ts;
     }
@@ -246 +255 @@
             break;
         }
+        /* adjust the relative timeout */
+        if (RT_UNLIKELY(pTimeout))
+        {
+            clock_gettime(CLOCK_REALTIME, &ts);
+            ts.tv_nsec = tsEnd.tv_nsec - ts.tv_nsec;
+            ts.tv_sec  = tsEnd.tv_nsec - 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--;
+            }
+            /* don't wait for less than 1 microsecond */
+            if (   ts.tv_sec < 0
+                || (ts.tv_sec == 0 && ts.tv_nsec < 1000))
+            {
+                rc = VERR_TIMEOUT;
+                break;
+            }
+        }
     }
 

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

@@ -218 +218 @@
      */
     struct timespec ts;
+    struct timespec tsEnd;
     struct timespec *pTimeout = NULL;
-    if (cMillies != RT_INDEFINITE_WAIT)
+    if (RT_UNLIKELY(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++;
+        }
         pTimeout = &ts;
     }
@@ -240 +249 @@
             ||  ASMAtomicCmpXchgS32(&pThis->iState, 1, 0))
         {
+            /* adjust the relative timeout */
+            if (RT_UNLIKELY(pTimeout))
+            {
+                clock_gettime(CLOCK_REALTIME, &ts);
+                ts.tv_nsec = tsEnd.tv_nsec - ts.tv_nsec;
+                ts.tv_sec  = tsEnd.tv_nsec - 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--;
+                }
+                /* don't wait for less than 1 microsecond */
+                if (   ts.tv_sec < 0
+                    || (ts.tv_sec == 0 && ts.tv_nsec < 1000))
+                    return VERR_TIMEOUT;
+            }
             long rc = sys_futex(&pThis->iState, FUTEX_WAIT, 1, pTimeout, NULL, 0);
             if (RT_UNLIKELY(pThis->iMagic != RTSEMEVENTMULTI_MAGIC))