Changeset 54194 in vbox for trunk/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c

Timestamp:

Feb 13, 2015 11:04:10 AM (10 years ago)

Author:

vboxsync

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

98254

Message:

undid some incorrect fixes.

File:

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

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

@@ -160 +160 @@
  * Destroys the timer when the reference counter has reached zero.
  *
+ * @returns 0 (new references counter value).
  * @param   pTimer              The timer.
  */
-static void rtTimeSolReleaseCleanup(PRTTIMER pTimer)
+static uint32_t rtTimeSolReleaseCleanup(PRTTIMER pTimer)
 {
     Assert(pTimer->hCyclicId == CYCLIC_NONE);
     ASMAtomicWriteU32(&pTimer->u32Magic, ~RTTIMER_MAGIC);
     RTMemFree(pTimer);
+    return 0;
 }
 
@@ -180 +182 @@
     uint32_t cRefs = ASMAtomicDecU32(&pTimer->cRefs);
     if (!cRefs)
-        rtTimeSolReleaseCleanup(pTimer);
+        return rtTimeSolReleaseCleanup(pTimer);
     return cRefs;
 }
@@ -268 +270 @@
             return;
         }
-    }
-
-    /*
-     * The timer has been suspended, set expiration time to infinitiy.
-     */
+
+        /*
+         * The timer has been suspended, set expiration time to infinitiy.
+         */
+    }
     if (RT_LIKELY(pTimer->hCyclicId != CYCLIC_NONE))
         cyclic_reprogram(pTimer->hCyclicId, CY_INFINITY);
@@ -316 +318 @@
             /*
              * The interval was changed, we need to set the expiration time
-             * our selves before returning.  This comes at a slight cost,
+             * ourselves before returning.  This comes at a slight cost,
              * which is why we don't do it all the time.
              *