Changeset 81069 in vbox

Timestamp:

Sep 28, 2019 8:41:09 PM (5 years ago)

Author:

vboxsync

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

133673

Message:

IPRT/timer-r0drv-linux.c: Guess we could schedule timers with the same jiffies value, maybe that's the trouble with the omni timer, some kind of smp skew. bugref:7636

File:

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

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

@@ -795 +795 @@
             ulNextJiffies = pSubTimer->u.Std.ulNextJiffies + cJiffies;
             pSubTimer->u.Std.ulNextJiffies = ulNextJiffies;
-            if (time_after(ulNextJiffies, uCurJiffies))
+            if (time_after_eq(ulNextJiffies, uCurJiffies))
             { /* likely */ }
             else
             {
-                unsigned long  cJiffiesBehind = uCurJiffies - ulNextJiffies;
-                if (cJiffies >= 2)
-                    ulNextJiffies = uCurJiffies + cJiffies / 2;
-                else
-                    ulNextJiffies = uCurJiffies + 1;
+                unsigned long cJiffiesBehind = uCurJiffies - ulNextJiffies;
+                ulNextJiffies = uCurJiffies + cJiffies / 2;
                 if (cJiffiesBehind >= HZ / 4) /* Conside if we're lagging too far behind.  Screw the u64NextTS member. */
                     pSubTimer->u.Std.ulNextJiffies = ulNextJiffies;
@@ -813 +810 @@
             const uint64_t u64NanoTS = RTTimeSystemNanoTS();
             const int64_t  cNsBehind = u64NanoTS - pSubTimer->u.Std.u64NextTS;
-            if (cNsBehind < 0)
+            if (cNsBehind <= 0)
                 ulNextJiffies = uCurJiffies + rtTimerLnxNanoToJiffies(pSubTimer->u.Std.u64NextTS - u64NanoTS);
             else if (u64NanoInterval >= RT_NS_1SEC_64 * 2 / HZ)