Changeset 25427 in vbox for trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c

Timestamp:

Dec 16, 2009 1:44:58 PM (15 years ago)

Author:

vboxsync

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

56075

Message:

Runtime/r0drv/timer-linux: make the hrtimer code work, requires Linux 2.6.28+ now

File:

• trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c (modified) (9 diffs)

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

@@ -48 +48 @@
 #include "internal/magics.h"
 
+/* We use the API of Linux 2.6.28+ (hrtimer_add_expires_ns()) */
 #if !defined(RT_USE_LINUX_HRTIMER) \
-    && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) \
-    && 0 /* disabled because it somehow sucks. */
+    && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) \
+    && 0 /* currently disabled */
 # define RT_USE_LINUX_HRTIMER
 #endif
@@ -56 +57 @@
 /* This check must match the ktime usage in rtTimeGetSystemNanoTS() / time-r0drv-linux.c. */
 #if defined(RT_USE_LINUX_HRTIMER) \
- && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
-# error "RT_USE_LINUX_HRTIMER requires 2.6.16 or later, sorry."
+ && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)
+# error "RT_USE_LINUX_HRTIMER requires 2.6.28 or later, sorry."
 #endif
 
@@ -99 +100 @@
 #else
     struct timer_list       LnxTimer;
-#endif
     /** The start of the current run (ns).
      * This is used to calculate when the timer ought to fire the next time. */
@@ -106 +106 @@
      * This is used to calculate when the timer ought to fire the next time. */
     uint64_t                u64NextTS;
+#endif
     /** The current tick number (since u64StartTS). */
     uint64_t                iTick;
@@ -250 +251 @@
     if (cNanoSecs > (uint64_t)TICK_NSEC * MAX_JIFFY_OFFSET)
         return MAX_JIFFY_OFFSET;
-#if ARCH_BITS == 32
+# if ARCH_BITS == 32
     if (RT_LIKELY(cNanoSecs <= UINT32_MAX))
         return ((uint32_t)cNanoSecs + (TICK_NSEC-1)) / TICK_NSEC;
-#endif
+# endif
     return (cNanoSecs + (TICK_NSEC-1)) / TICK_NSEC;
 }
-#endif
+#endif /* ! RT_USE_LINUX_HRTIMER */
 
 
@@ -272 +273 @@
      */
     uint64_t u64NextTS = u64Now + u64First;
+#ifndef RT_USE_LINUX_HRTIMER
     pSubTimer->u64StartTS = u64NextTS;
     pSubTimer->u64NextTS = u64NextTS;
+#endif
+
     pSubTimer->iTick = 0;
 
@@ -368 +372 @@
     else
     {
+        const uint64_t iTick = ++pSubTimer->iTick;
+
+#ifdef RT_USE_LINUX_HRTIMER
+        hrtimer_add_expires_ns(&pSubTimer->LnxTimer, pTimer->u64NanoInterval);
+        rc = HRTIMER_RESTART;
+#else
+        const uint64_t u64NanoTS = RTTimeNanoTS();
+
         /*
          * Interval timer, calculate the next timeout and re-arm it.
@@ -375 +387 @@
          * This may of course backfire with highres timers...
          */
-        const uint64_t u64NanoTS = RTTimeNanoTS();
-        const uint64_t iTick = ++pSubTimer->iTick;
-
         if (RT_UNLIKELY(iTick == 1))
         {
-#ifdef RT_USE_LINUX_HRTIMER
-            pSubTimer->u64StartTS = pSubTimer->u64NextTS = u64NanoTS;//rtTimerLnxKtToNano(pSubTimer->LnxTimer.base->softirq_time);
-#else
             pSubTimer->u64StartTS = pSubTimer->u64NextTS = u64NanoTS;
             pSubTimer->ulNextJiffies = jiffies;
-#endif
         }
 
         pSubTimer->u64NextTS += pTimer->u64NanoInterval;
-
-#ifdef RT_USE_LINUX_HRTIMER
-        while (pSubTimer->u64NextTS < u64NanoTS)
-            pSubTimer->u64NextTS += pTimer->u64NanoInterval;
-
-        pSubTimer->LnxTimer.expires = rtTimerLnxNanoToKt(pSubTimer->u64NextTS);
-        rc = HRTIMER_RESTART;
-#else
         if (pTimer->cJiffies)
         {
@@ -896 +893 @@
         pTimer->aSubTimers[iCpu].LnxTimer.function = rtTimerLinuxCallback;
         pTimer->aSubTimers[iCpu].LnxTimer.expires  = jiffies;
-#endif
         pTimer->aSubTimers[iCpu].u64StartTS = 0;
         pTimer->aSubTimers[iCpu].u64NextTS = 0;
+#endif
         pTimer->aSubTimers[iCpu].iTick = 0;
         pTimer->aSubTimers[iCpu].pParent = pTimer;