Changeset 48185 in vbox for trunk/src

Timestamp:

Aug 30, 2013 10:10:27 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88568

Message:

r0drv/solaris/timer: Implement one-shot timers the right way.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c

@@ -141 +141 @@
     NOREF(pvUser2);
 
-    if (   pTimer->fSuspended
-        && pTimer->interval == 0)
-        return;
+    /* Make sure one-shots do not fire another time. */
+    Assert(   !pTimer->fSuspended
+           || pTimer->interval != 0);
 
     /* For one-shot specific timers, allow RTTimer to restart them. */
-    /** @todo cyclic_reprogram() to CY_INFINITY? */
     if (pTimer->interval == 0)
         pTimer->fSuspended = true;
@@ -172 +171 @@
     if (pTimer->pSingleTimer)
     {
-        if (   pTimer->fSuspended
-            && pTimer->interval == 0)
-            return;
+        /* Make sure one-shots do not fire another time. */
+        Assert(   !pTimer->fSuspended
+               || pTimer->interval != 0);
 
         /* For specific timers, we might fire on the wrong CPU between cyclic_add() and cyclic_bind().
@@ -186 +185 @@
 
         /* For one-shot any-cpu timers, allow RTTimer to restart them. */
-        /** @todo cyclic_reprogram() to CY_INFINITY? */
         if (pTimer->interval == 0)
             pTimer->fSuspended = true;
@@ -387 +385 @@
         if (pTimer->interval == 0)
         {
-            /* cylic_add() comment: "The caller is responsible for assuring that cyt_when + cyt_interval <= INT64_MAX" */
-            pSingleTimer->hFireTime.cyt_interval = INT64_MAX - pSingleTimer->hFireTime.cyt_when;
+            /*
+             * cylic_add() comment: "The caller is responsible for assuring that cyt_when + cyt_interval <= INT64_MAX"
+             * but it contradicts itself because cyclic_reprogram() updates only the interval and accepts CY_INFINITY as
+             * a valid special value. See cyclic_fire().
+             */
+            pSingleTimer->hFireTime.cyt_interval = CY_INFINITY;
         }
         else