Changeset 9444 in vbox for trunk/src/VBox/Runtime/r0drv/freebsd

Timestamp:

Jun 5, 2008 6:08:17 PM (17 years ago)

Author:

vboxsync

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

31696

Message:

Added iTick to FNTIMER (the timer callback).

File:

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

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

@@ -97 +97 @@
      * Validate flags.
      */
-    if (!RTTIMER_FLAGS_IS_VALID(fFlags))
+    if (!RTTIMER_FLAGS_ARE_VALID(fFlags))
         return VERR_INVALID_PARAMETER;
     if (    (fFlags & RTTIMER_FLAGS_CPU_SPECIFIC)
@@ -214 +214 @@
     if (    pTimer->iCpu == RTTIMER_FLAGS_CPU_MASK
         ||  (u_int)pTimer->iCpu == curcpu)
-        pTimer->pfnTimer(pTimer, pTimer->pvUser);
+        pTimer->pfnTimer(pTimer, pTimer->pvUser, pTimer->iTick);
 }
 
@@ -223 +223 @@
 
     /* calculate and set the next timeout */
+    pTimer->iTick++;
     if (!pTimer->u64NanoInterval)
     {
@@ -232 +233 @@
         struct timeval tv;
         const uint64_t u64NanoTS = RTTimeNanoTS();
-        pTimer->iTick++;
         pTimer->u64NextTS = pTimer->u64StartTS + pTimer->iTick * pTimer->u64NanoInterval;
         if (pTimer->u64NextTS < u64NanoTS)
@@ -245 +245 @@
     if (    !pTimer->fSpecificCpu
         ||  pTimer->iCpu == curcpu)
-        pTimer->pfnTimer(pTimer, pTimer->pvUser);
+        pTimer->pfnTimer(pTimer, pTimer->pvUser, pTimer->iTick);
     else
         smp_rendezvous(NULL, rtTimerFreeBSDIpiAction, NULL, pvTimer);