Changeset 18615 in vbox for trunk/src/VBox

Timestamp:

Apr 1, 2009 8:19:22 PM (16 years ago)

Author:

vboxsync

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

45521

Message:

PDM: At last, no more polling!

Location:

trunk/src/VBox/VMM

Files:

• PDM.cpp (modified) (3 diffs)
• PDMInternal.h (modified) (1 diff)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDM.cpp

@@ -289 +289 @@
 static DECLCALLBACK(int) pdmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Version);
 static DECLCALLBACK(int) pdmR3LoadPrep(PVM pVM, PSSMHANDLE pSSM);
-static DECLCALLBACK(void) pdmR3PollerTimer(PVM pVM, PTMTIMER pTimer, void *pvUser);
 
 
@@ -332 +331 @@
     pVM->pdm.s.offVM = RT_OFFSETOF(VM, pdm.s);
     pVM->pdm.s.GCPhysVMMDevHeap = NIL_RTGCPHYS;
-
-    int rc = TMR3TimerCreateInternal(pVM, TMCLOCK_VIRTUAL, pdmR3PollerTimer, NULL, "PDM Poller", &pVM->pdm.s.pTimerPollers);
-    AssertRC(rc);
 
     /*
@@ -1324 +1320 @@
 VMMR3DECL(void) PDMR3Poll(PVM pVM)
 {
-    /* This is temporary hack and shall be removed ASAP! */
-    unsigned iPoller = pVM->pdm.s.cPollers;
-    if (iPoller)
-    {
-        while (iPoller-- > 0)
-            pVM->pdm.s.apfnPollers[iPoller](pVM->pdm.s.aDrvInsPollers[iPoller]);
-        TMTimerSetMillies(pVM->pdm.s.pTimerPollers, 3);
-    }
-}
-
-
-/**
- * Internal timer callback function.
- *
- * @param   pVM             The VM.
- * @param   pTimer          The timer handle.
- * @param   pvUser          User argument specified upon timer creation.
- */
-static DECLCALLBACK(void) pdmR3PollerTimer(PVM pVM, PTMTIMER pTimer, void *pvUser)
-{
-    PDMR3Poll(pVM);
+    /** @todo remove after committing other EM changes. */
 }
 

trunk/src/VBox/VMM/PDMInternal.h

@@ -892 +892 @@
     /** @} */
 
-    /** TEMPORARY HACKS FOR NETWORK POLLING.
-     * @todo fix NAT and kill this!
-     * @{ */
-    RTUINT                          cPollers;
-#if HC_ARCH_BITS == 64
-    RTUINT                          padding1;
-#endif
-    R3PTRTYPE(PFNPDMDRVPOLLER)      apfnPollers[16];
-    R3PTRTYPE(PPDMDRVINS)           aDrvInsPollers[16];
-    PTMTIMERR3                      pTimerPollers;
-    /** @} */
-
     /** The PDM lock.
      * This is used to protect everything that deals with interrupts, i.e.

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -338 +338 @@
     GEN_CHECK_OFF(PDM, pThreads);
     GEN_CHECK_OFF(PDM, pThreadsTail);
-    GEN_CHECK_OFF(PDM, cPollers);
-    GEN_CHECK_OFF(PDM, apfnPollers);
-    GEN_CHECK_OFF(PDM, aDrvInsPollers);
-    GEN_CHECK_OFF(PDM, pTimerPollers);
     GEN_CHECK_OFF(PDM, CritSect);
     GEN_CHECK_OFF(PDM, StatQueuedCritSectLeaves);