Changeset 19498 in vbox

Timestamp:

May 7, 2009 6:08:16 PM (16 years ago)

Author:

vboxsync

Message:

TMAll.cpp: Drop two wrong assertions in TMTimerSet (the queue might be rescheduled at the same time).

File:

• trunk/src/VBox/VMM/VMMAll/TMAll.cpp (modified) (7 diffs)

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

@@ -552 +552 @@
          */
         TMTIMERSTATE enmState = pTimer->enmState;
-        Log2(("TMTimerDestroy: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n",
+        Log2(("TMTimerDestroy: %p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n",
               pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), cRetries));
         switch (enmState)
@@ -653 +653 @@
          */
         TMTIMERSTATE    enmState = pTimer->enmState;
-        Log2(("TMTimerSet: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d u64Expire=%llu\n",
+        Log2(("TMTimerSet: %p:{.enmState=%s, .pszDesc='%s'} cRetries=%d u64Expire=%llu\n",
               pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), cRetries, u64Expire));
         switch (enmState)
@@ -679 +679 @@
                 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);
@@ -865 +863 @@
          */
         TMTIMERSTATE    enmState = pTimer->enmState;
-        Log2(("TMTimerStop: pTimer=%p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n",
+        Log2(("TMTimerStop: %p:{.enmState=%s, .pszDesc='%s'} cRetries=%d\n",
               pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), cRetries));
         switch (enmState)
@@ -1351 +1349 @@
     switch (enmState)
     {
-#define CASE(state) case state: return #state + sizeof("TMTIMERSTATE_") - 1
-        CASE(TMTIMERSTATE_STOPPED);
-        CASE(TMTIMERSTATE_ACTIVE);
-        CASE(TMTIMERSTATE_EXPIRED);
-        CASE(TMTIMERSTATE_PENDING_STOP);
-        CASE(TMTIMERSTATE_PENDING_STOP_SCHEDULE);
-        CASE(TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE);
-        CASE(TMTIMERSTATE_PENDING_SCHEDULE);
-        CASE(TMTIMERSTATE_PENDING_RESCHEDULE_SET_EXPIRE);
-        CASE(TMTIMERSTATE_PENDING_RESCHEDULE);
-        CASE(TMTIMERSTATE_PENDING_STOP_DESTROY);
-        CASE(TMTIMERSTATE_PENDING_DESTROY);
-        CASE(TMTIMERSTATE_FREE);
+#define CASE(num, state) \
+            case TMTIMERSTATE_##state: \
+                AssertCompile(TMTIMERSTATE_##state == (num)); \
+                return #num "-" #state
+        CASE( 1,STOPPED);
+        CASE( 2,ACTIVE);
+        CASE( 3,EXPIRED);
+        CASE( 4,PENDING_STOP);
+        CASE( 5,PENDING_STOP_SCHEDULE);
+        CASE( 6,PENDING_SCHEDULE_SET_EXPIRE);
+        CASE( 7,PENDING_SCHEDULE);
+        CASE( 8,PENDING_RESCHEDULE_SET_EXPIRE);
+        CASE( 9,PENDING_RESCHEDULE);
+        CASE(10,PENDING_STOP_DESTROY);
+        CASE(11,PENDING_DESTROY);
+        CASE(12,FREE);
         default:
             AssertMsgFailed(("Invalid state enmState=%d\n", enmState));
@@ -1600 +1601 @@
          * Do the scheduling.
          */
-        Log2(("tmTimerQueueSchedule: pTimer=%p:{.enmState=%s, .enmClock=%d, .enmType=%d, .pszDesc=%s}\n",
+        Log2(("tmTimerQueueSchedule: %p:{.enmState=%s, .enmClock=%d, .enmType=%d, .pszDesc=%s}\n",
               pTimer, tmTimerState(pTimer->enmState), pTimer->enmClock, pTimer->enmType, R3STRING(pTimer->pszDesc)));
         tmTimerQueueScheduleOne(pQueue, pTimer);
-        Log2(("tmTimerQueueSchedule: new %s\n", tmTimerState(pTimer->enmState)));
+        Log2(("tmTimerQueueSchedule: %p: new %s\n", pTimer, tmTimerState(pTimer->enmState)));
     } /* foreach timer in current schedule batch. */
 }
@@ -1636 +1637 @@
             {
                 case TMTIMERSTATE_ACTIVE:
-                    AssertMsg(!pCur->offScheduleNext, ("%s: %RI32\n", pszWhere, pCur->offScheduleNext));
+                    AssertMsg(  !pCur->offScheduleNext
+                              || pCur->enmState != TMTIMERSTATE_ACTIVE,
+                              ("%s: %RI32\n", pszWhere, pCur->offScheduleNext));
                     break;
                 case TMTIMERSTATE_PENDING_STOP: