Changeset 6409 in vbox

Timestamp:

Jan 21, 2008 2:09:22 PM (17 years ago)

Author:

vboxsync

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

27368

Message:

Backed out the TMAll.cpp part of r27160 because it isn't just shutting up a problem that needs to be fixed if it's there.

File:

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

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

@@ -508 +508 @@
 
             case TMTIMERSTATE_PENDING_SCHEDULE:
+            case TMTIMERSTATE_PENDING_STOP_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))
-                {
-                    /* 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);
@@ -1171 +1157 @@
                     TMTIMER_SET_NEXT(pPrev, pNext);
                 else
-                {       
+                {
                     TMTIMER_SET_HEAD(pQueue, pNext);
                     pQueue->u64Expire = pNext ? pNext->u64Expire : INT64_MAX;
@@ -1181 +1167 @@
                 /* fall thru */
             }
-    
+
             /*
              * Schedule timer (insert into the active list).
@@ -1227 +1213 @@
                 return;
             }
-    
+
             /*
              * Stop the timer in active list.
@@ -1251 +1237 @@
                 /* fall thru */
             }
-    
+
             /*
              * Stop the timer (not on the active list).
@@ -1260 +1246 @@
                     break;
                 return;
-    
+
             /*
              * Stop & destroy the timer.
@@ -1281 +1267 @@
                 /* fall thru */
             }
-    
+
             /*
              * Destroy the timer.
@@ -1291 +1277 @@
                 const PTMTIMER pBigPrev = (PTMTIMER)(pTimer->pBigPrev ? MMHyperR3ToCC(pVM, pTimer->pBigPrev) : NULL);
                 const PTMTIMER pBigNext = (PTMTIMER)(pTimer->pBigNext ? MMHyperR3ToCC(pVM, pTimer->pBigNext) : NULL);
-    
+
                 /* unlink from created list */
                 if (pBigPrev)
@@ -1301 +1287 @@
                 pTimer->pBigNext = 0;
                 pTimer->pBigPrev = 0;
-    
+
                 /* free */
                 Log2(("TM: Inserting %p into the free list ahead of %p!\n", pTimer, pVM->tm.s.pFree));
@@ -1309 +1295 @@
                 return;
             }
-    
+
             /*
              * Postpone these until they get into the right state.
@@ -1318 +1304 @@
                 STAM_COUNTER_INC(&pTimer->CTXALLSUFF(pVM)->tm.s.CTXALLSUFF(StatPostponed));
                 return;
-    
+
             /*
              * None of these can be in the schedule.