Changeset 48148 in vbox for trunk/src/VBox

Timestamp:

Aug 29, 2013 12:04:40 PM (11 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/solaris: Fix race with specific timers and enabled tstRTR0Timer testing of it.

Location:

trunk/src/VBox/Runtime

Files:

• r0drv/solaris/timer-r0drv-solaris.c (modified) (2 diffs)
• testcase/tstRTR0TimerDriver.cpp (modified) (2 diffs)

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

@@ -206 +206 @@
         return VERR_NOT_SUPPORTED;
 
+    /* One-shot timers are not supported by the cyclic system. */
+    if (u64NanoInterval == 0)
+        return VERR_NOT_SUPPORTED;
+
     /*
      * Allocate and initialize the timer handle.
@@ -342 +346 @@
             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);
         if (iCpu != SOL_TIMER_ANY_CPU)
             cyclic_bind(pTimer->hCyclicId, cpu[iCpu], NULL /* cpupart */);
 
+        ASMSetFlags(uEflags);
         mutex_exit(&cpu_lock);
     }

trunk/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp

@@ -61 +61 @@
      * Standard timers.
      */
-#  ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
     RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_BASIC,       "Basic one shot");
-#  endif
     RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_BASIC,       "Basic periodic");
     if (RTTestErrorCount(g_hTest) == 0)
     {
 #  if 1
-#   ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_RESTART, "Restart one shot from callback");
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_DESTROY, "Destroy one shot from callback");
-#   endif
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_CSSD_LOOPS, "Create-start-stop-destroy loops");
         for (uint32_t i = 0; i <= 7; i++)
             RTR3TestR0SimpleTestWithArg(TSTRTR0TIMER_PERIODIC_CHANGE_INTERVAL, i, "Change interval from callback, variation %u", i);
 #  endif
-#   ifndef RT_OS_SOLARIS // one-shot timers currently not supported on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_SPECIFIC, "One shot cpu specific");
-#   endif
-#   ifndef RT_OS_SOLARIS // periodic specific timers have currently a bug on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_SPECIFIC, "Periodic cpu specific");
-#   endif
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_OMNI, "Periodic omni timer");
     }
@@ -108 +100 @@
         RTR3TestR0SimpleTest(TSTRTR0TIMER_ONE_SHOT_SPECIFIC_HIRES, "One shot hires cpu specific");
 #   endif
-#   ifndef RT_OS_SOLARIS // periodic specific timers have currently a bug on Solaris
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_SPECIFIC_HIRES, "Periodic hires cpu specific");
-#   endif
         RTR3TestR0SimpleTest(TSTRTR0TIMER_PERIODIC_OMNI, "Periodic omni hires timer");
     }