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

Timestamp:

Aug 29, 2013 5:16:42 PM (11 years ago)

Author:

vboxsync

Message:

r0drv/solaris/timer: Fix specific periodic timers, one-shot any-cpu timers.
Fixed R0 timer testcase to not do unsupported and potentially dangerous tests on Solaris.

File:

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

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

@@ -137 +137 @@
     PRTTIMER pTimer = (PRTTIMER)pvArg;
     AssertPtrReturnVoid(pTimer);
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+
+    if (pTimer->fSuspended)
+        return;
 
     if (pTimer->pSingleTimer)
     {
+        /* For specific periodic timers, we might fire on the wrong CPU between cyclic_add() and cyclic_bind().
+           Ignore these shots while we are temporarily rebinding to the right CPU. */
+        if (   pTimer->fSpecificCpu
+            && pTimer->interval != 0
+            && pTimer->iCpu != RTMpCpuId())          /* ASSUMES: index == cpuid */
+        {
+            return;
+        }
+
+        /* Allow RTTimer to be restarted for one-shot timers. */
+        if (pTimer->interval == 0)
+            pTimer->fSuspended = true;
         uint64_t u64Tick = ++pTimer->pSingleTimer->u64Tick;
         pTimer->pfnTimer(pTimer, pTimer->pvUser, u64Tick);
@@ -203 +219 @@
         return VERR_CPU_NOT_FOUND;
 
-    if ((fFlags & RTTIMER_FLAGS_CPU_ALL) == RTTIMER_FLAGS_CPU_ALL && u64NanoInterval == 0)
+    /* One-shot omni timers are not supported by the cyclic system. */
+    if (   (fFlags & RTTIMER_FLAGS_CPU_ALL) == RTTIMER_FLAGS_CPU_ALL
+        && u64NanoInterval == 0)
+    {
         return VERR_NOT_SUPPORTED;
-
-    /* One-shot timers are not supported by the cyclic system. */
-    if (u64NanoInterval == 0)
+    }
+
+    /* One-shot specific timers are not supported. See rtTimerSolCallbackWrapper(). */
+    if (   (fFlags & RTTIMER_FLAGS_CPU_ALL) != RTTIMER_FLAGS_CPU_ALL
+        && (fFlags & RTTIMER_FLAGS_CPU_SPECIFIC)
+        && u64NanoInterval == 0)
+    {
         return VERR_NOT_SUPPORTED;
+    }
 
     /*
@@ -274 +298 @@
         return VERR_TIMER_ACTIVE;
 
-    /* One-shot timers are not supported by the cyclic system. */
-    if (pTimer->interval == 0)
-        return VERR_NOT_SUPPORTED;
-
     pTimer->fSuspended = false;
     if (pTimer->fAllCpu)
     {
+        Assert(pTimer->interval);
         PRTR0OMNITIMERSOL pOmniTimer = RTMemAllocZ(sizeof(RTR0OMNITIMERSOL));
         if (RT_UNLIKELY(!pOmniTimer))
@@ -338 +359 @@
         pSingleTimer->hFireTime.cyt_when = u64First + RTTimeNanoTS();
         if (pTimer->interval == 0)
-        {
-            /** @todo use gethrtime_max instead of LLONG_MAX? */
-            AssertCompileSize(pSingleTimer->hFireTime.cyt_interval, sizeof(long long));
-            pSingleTimer->hFireTime.cyt_interval = LLONG_MAX - pSingleTimer->hFireTime.cyt_when;
-        }
+            pSingleTimer->hFireTime.cyt_interval = INT64_MAX - pSingleTimer->hFireTime.cyt_when;
         else
             pSingleTimer->hFireTime.cyt_interval = pTimer->interval;
-
-        /* Disable interrupts to prevent timer firing between cyclic_add() and cyclic_bind(). */
-        RTCCUINTREG uEflags = ASMIntDisableFlags();
 
         pTimer->hCyclicId = cyclic_add(&pSingleTimer->hHandler, &pSingleTimer->hFireTime);
@@ -353 +367 @@
             cyclic_bind(pTimer->hCyclicId, cpu[iCpu], NULL /* cpupart */);
 
-        ASMSetFlags(uEflags);
         mutex_exit(&cpu_lock);
     }