Changeset 6296 in vbox

Timestamp:

Jan 9, 2008 1:11:37 PM (17 years ago)

Author:

vboxsync

Message:

LED and Network Config interfaces added. Fix in TMAll.cpp: Assertions in PENDING_STOP_SCHEDULE could be
triggered erroneously when a timer stop is being scheduled by EMT and another thread sets the timer.

Location:

trunk/src/VBox

Files:

• Runtime/common/string/strformat.cpp (modified) (1 diff)
• VMM/VMMAll/TMAll.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/string/strformat.cpp

@@ -220 +220 @@
      * Special (0/0x).
      */
-    if (fFlags & RTSTR_F_SPECIAL && (uiBase % 8) == 0)
+    if ((fFlags & RTSTR_F_SPECIAL) && (uiBase % 8) == 0)
     {
         psz[i++] = '0';

trunk/src/VBox/VMM/VMMAll/TMAll.cpp

@@ -508 +508 @@
 
             case TMTIMERSTATE_PENDING_SCHEDULE:
+                if (tmTimerTry(pTimer, TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE, enmState))
+                {
+                    Assert(!pTimer->offPrev);
+                    Assert(!pTimer->offNext);
+                    pTimer->u64Expire = u64Expire;
+                    TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_SCHEDULE);
+                    tmSchedule(pTimer);
+                    STAM_PROFILE_STOP(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatTimerSet), a);
+                    return VINF_SUCCESS;
+                }
+                break;
+
+
             case TMTIMERSTATE_PENDING_STOP_SCHEDULE:
                 if (tmTimerTry(pTimer, TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE, enmState))
                 {
-                    Assert(!pTimer->offPrev);
-                    Assert(!pTimer->offNext);
+                    /* The timer is possibly being excluded from the active list atm */
+                    ///Assert(!pTimer->offPrev);
+                    ///Assert(!pTimer->offNext);
                     pTimer->u64Expire = u64Expire;
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_SCHEDULE);