Changeset 54238 in vbox

Timestamp:

Feb 17, 2015 3:26:13 PM (10 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/solaris: timer todo and nit.

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -93 +93 @@
         struct
         {
-            /** Cyclic handler. */
-            cyc_handler_t   Handler;
-            /** Cyclic time and interval representation. */
-            cyc_time_t      FireTime;
             /** Timer ticks. */
             uint64_t        u64Tick;
@@ -514 +510 @@
     else
     {
+        cyc_handler_t Handler;
+        cyc_time_t    FireTime;
+
         /*
          * Setup a single CPU timer.   If a specific CPU was requested, it
@@ -527 +526 @@
         }
 
-        /** @todo we probably don't need to have cyc_handler_t and cyc_time_t in the
-         *        timer structure... */
-        pTimer->u.Single.Handler.cyh_func  = (cyc_func_t)rtTimerSolSingleCallbackWrapper;
-        pTimer->u.Single.Handler.cyh_arg   = pTimer;
-        pTimer->u.Single.Handler.cyh_level = CY_LOCK_LEVEL;
+        Handler.cyh_func  = (cyc_func_t)rtTimerSolSingleCallbackWrapper;
+        Handler.cyh_arg   = pTimer;
+        Handler.cyh_level = CY_LOCK_LEVEL;
 
         /*
@@ -538 +535 @@
          * See @bugref{7691} comment #20.
          */
-        pTimer->u.Single.FireTime.cyt_when = RTTimeSystemNanoTS() + u64First;
-        if (pTimer->fSpecificCpu)
-            pTimer->u.Single.FireTime.cyt_when += RT_NS_1HOUR;
-        pTimer->u.Single.FireTime.cyt_interval = pTimer->cNsInterval != 0
-                                               ? pTimer->cNsInterval
-                                               : CY_INFINITY /* Special value, see cyclic_fire(). */;
+        if (!pTimer->fSpecificCpu)
+            FireTime.cyt_when = RTTimeSystemNanoTS() + u64First;
+        else
+            FireTime.cyt_when = RTTimeSystemNanoTS() + u64First + RT_NS_1HOUR;
+        FireTime.cyt_interval = pTimer->cNsInterval != 0
+                              ? pTimer->cNsInterval
+                              : CY_INFINITY /* Special value, see cyclic_fire(). */;
         pTimer->u.Single.u64Tick = 0;
         pTimer->u.Single.nsNextTick = 0;
 
-        pTimer->hCyclicId = cyclic_add(&pTimer->u.Single.Handler, &pTimer->u.Single.FireTime);
+        pTimer->hCyclicId = cyclic_add(&Handler, &FireTime);
         if (pTimer->fSpecificCpu)
         {