Changeset 40920 in vbox

Timestamp:

Apr 14, 2012 11:51:38 AM (13 years ago)

Author:

vboxsync

Message:

Set the idTracing members.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PDM.cpp (modified) (1 diff)
• VMMR3/PDMDevice.cpp (modified) (3 diffs)
• VMMR3/PDMDriver.cpp (modified) (2 diffs)
• VMMR3/PDMUsb.cpp (modified) (1 diff)
• include/PDMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PDM.cpp

@@ -367 +367 @@
      */
     pVM->pdm.s.GCPhysVMMDevHeap = NIL_RTGCPHYS;
+    //pVM->pdm.s.idTracingDev = 0;
+    pVM->pdm.s.idTracingOther = 1024;
 
     /*

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -315 +315 @@
          */
         pDevIns->u32Version                     = PDM_DEVINS_VERSION;
+        pDevIns->iInstance                      = paDevs[i].iInstance;
         //pDevIns->Internal.s.pNextR3             = NULL;
         //pDevIns->Internal.s.pPerDeviceNextR3    = NULL;
@@ -330 +331 @@
         //pDevIns->Internal.s.pPciBusRC           = 0;
         pDevIns->Internal.s.fIntFlags           = PDMDEVINSINT_FLAGS_SUSPENDED;
+        //pDevIns->Internal.s.uLastIrqTag         = 0;
         pDevIns->pHlpR3                         = fTrusted ? &g_pdmR3DevHlpTrusted : &g_pdmR3DevHlpUnTrusted;
         pDevIns->pHlpRC                         = pHlpRC;
@@ -335 +337 @@
         pDevIns->pReg                           = paDevs[i].pDev->pReg;
         pDevIns->pCfg                           = pConfigNode;
-        pDevIns->iInstance                      = paDevs[i].iInstance;
+        //pDevIns->IBase.pfnQueryInterface        = NULL;
+        //pDevIns->fTracing                       = 0;
+        pDevIns->idTracing                      = ++pVM->pdm.s.idTracingDev;
         pDevIns->pvInstanceDataR3               = &pDevIns->achInstanceData[0];
         pDevIns->pvInstanceDataRC               = pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_RC

trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

@@ -691 +691 @@
                      */
                     pNew->u32Version                = PDM_DRVINS_VERSION;
+                    pNew->iInstance                 = pDrv->iNextInstance;
                     pNew->Internal.s.pUp            = pDrvAbove ? pDrvAbove : NULL;
                     //pNew->Internal.s.pDown          = NULL;
@@ -706 +707 @@
                     pNew->pReg                      = pDrv->pReg;
                     pNew->pCfg                      = pConfigNode;
-                    pNew->iInstance                 = pDrv->iNextInstance;
                     pNew->pUpBase                   = pBaseInterface;
                     Assert(!pDrvAbove || pBaseInterface == &pDrvAbove->IBase);
                     //pNew->pDownBase                 = NULL;
                     //pNew->IBase.pfnQueryInterface   = NULL;
+                    //pNew->fTracing                  = 0;
+                    pNew->idTracing                 = ++pVM->pdm.s.idTracingOther;
                     pNew->pHlpR3                    = &g_pdmR3DrvHlp;
                     pNew->pvInstanceDataR3          = &pNew->achInstanceData[0];

trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

@@ -577 +577 @@
     pUsbIns->pvInstanceDataR3               = &pUsbIns->achInstanceData[0];
     pUsbIns->pszName                        = RTStrDup(pUsbDev->pReg->szName);
+    //pUsbIns->fTracing                       = 0;
+    pUsbIns->idTracing                      = ++pVM->pdm.s.idTracingOther;
 
     /*

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1015 +1015 @@
      * See PDM_QUEUE_FLUSH_FLAG_ACTIVE and PDM_QUEUE_FLUSH_FLAG_PENDING. */
     uint32_t volatile               fQueueFlushing;
+
     /** The current IRQ tag (tracing purposes). */
-    uint32_t                        uIrqTag;
+    uint32_t volatile               uIrqTag;
+
+    /** The tracing ID of the next device instance.
+     *
+     * @remarks We keep the device tracing ID seperate from the rest as these are
+     *          then more likely to end up with the same ID from one run to
+     *          another, making analysis somewhat easier.  Drivers and USB devices
+     *          are more volatile and can be changed at runtime, thus these are much
+     *          less likely to remain stable, so just heap them all together. */
+    uint32_t                        idTracingDev;
+    /** The tracing ID of the next driver instance, USB device instance or other
+     * PDM entity requiring an ID. */
+    uint32_t                        idTracingOther;
 
     /** @name   VMM device heap