Changeset 64841 in vbox for trunk

Timestamp:

Dec 12, 2016 5:50:01 PM (8 years ago)

Author:

vboxsync

Message:

Devices/Storage: Remove statistics superseeded by the ones available in the media access drivers now, some weren't even updated anymore

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevAHCI.cpp (modified) (4 diffs)
• Storage/DrvSCSI.cpp (modified) (5 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -426 +426 @@
     SUPSEMEVENT                     hEvtProcess;
 
-    /** Release statistics: number of DMA commands. */
-    STAMCOUNTER                     StatDMA;
-    /** Release statistics: number of bytes written. */
-    STAMCOUNTER                     StatBytesWritten;
-    /** Release statistics: number of bytes read. */
-    STAMCOUNTER                     StatBytesRead;
-    /** Release statistics: Number of I/O requests processed per second. */
-    STAMCOUNTER                     StatIORequestsPerSecond;
-#ifdef VBOX_WITH_STATISTICS
-    /** Statistics: Time to complete one request. */
-    STAMPROFILE                     StatProfileProcessTime;
-    /** Statistics: Amount of time to read/write data. */
-    STAMPROFILE                     StatProfileReadWrite;
-#endif /* VBOX_WITH_STATISTICS */
-
     /** The serial numnber to use for IDENTIFY DEVICE commands. */
     char                            szSerialNumber[AHCI_SERIAL_NUMBER_LENGTH+1]; /** < one extra byte for termination */
@@ -456 +441 @@
 typedef AHCIPort *PAHCIPort;
 
-AssertCompileMemberAlignment(AHCIPort, StatDMA, 8);
 AssertCompileSizeAlignment(AHCIPort, 8);
 
@@ -3708 +3692 @@
     {
         if (pAhciReq->enmType == PDMMEDIAEXIOREQTYPE_READ)
-        {
-            STAM_REL_COUNTER_ADD(&pAhciPort->StatBytesRead, pAhciReq->cbTransfer);
             pAhciPort->Led.Actual.s.fReading = 0;
-        }
         else if (pAhciReq->enmType == PDMMEDIAEXIOREQTYPE_WRITE)
-        {
-            STAM_REL_COUNTER_ADD(&pAhciPort->StatBytesWritten, pAhciReq->cbTransfer);
             pAhciPort->Led.Actual.s.fWriting = 0;
-        }
         else if (pAhciReq->enmType == PDMMEDIAEXIOREQTYPE_DISCARD)
             pAhciPort->Led.Actual.s.fWriting = 0;
@@ -6032 +6010 @@
     /* Initialize static members on every port. */
     for (i = 0; i < AHCI_MAX_NR_PORTS_IMPL; i++)
-    {
-        PAHCIPort pAhciPort = &pThis->ahciPort[i];
-
-        PDMDevHlpSTAMRegisterF(pDevIns, &pAhciPort->StatDMA, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES,
-                               "Number of DMA transfers.", "/Devices/SATA%d/Port%d/DMA", iInstance, i);
-        PDMDevHlpSTAMRegisterF(pDevIns, &pAhciPort->StatBytesRead, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_BYTES,
-                               "Amount of data read.", "/Devices/SATA%d/Port%d/ReadBytes", iInstance, i);
-        PDMDevHlpSTAMRegisterF(pDevIns, &pAhciPort->StatBytesWritten, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_BYTES,
-                               "Amount of data written.", "/Devices/SATA%d/Port%d/WrittenBytes", iInstance, i);
-        PDMDevHlpSTAMRegisterF(pDevIns, &pAhciPort->StatIORequestsPerSecond, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES,
-                               "Number of processed I/O requests per second.", "/Devices/SATA%d/Port%d/IORequestsPerSecond", iInstance, i);
-#ifdef VBOX_WITH_STATISTICS
-        PDMDevHlpSTAMRegisterF(pDevIns, &pAhciPort->StatProfileProcessTime, STAMTYPE_PROFILE, STAMVISIBILITY_USED, STAMUNIT_NS_PER_CALL,
-                               "Amount of time to process one request.", "/Devices/SATA%d/Port%d/ProfileProcessTime", iInstance, i);
-        PDMDevHlpSTAMRegisterF(pDevIns, &pAhciPort->StatProfileReadWrite, STAMTYPE_PROFILE, STAMVISIBILITY_USED, STAMUNIT_NS_PER_CALL,
-                               "Amount of time for the read/write operation to complete.", "/Devices/SATA%d/Port%d/ProfileReadWrite", iInstance, i);
-#endif
-
-        ahciPortHwReset(pAhciPort);
-    }
+        ahciPortHwReset(&pThis->ahciPort[i]);
 
     /* Attach drivers to every available port. */

trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

@@ -133 +133 @@
      * any of the dummy functions. */
     bool volatile           fDummySignal;
-    /** Release statistics: number of bytes written. */
-    STAMCOUNTER             StatBytesWritten;
-    /** Release statistics: number of bytes read. */
-    STAMCOUNTER             StatBytesRead;
-    /** Release statistics: Current I/O depth. */
+    /** Current I/O depth. */
     volatile uint32_t       StatIoDepth;
     /** Errors printed in the release log. */
@@ -358 +354 @@
                 pThis->pLed->Asserted.s.fReading = pThis->pLed->Actual.s.fReading = 1;
                 rc = pThis->pDrvMediaEx->pfnIoReqRead(pThis->pDrvMediaEx, hIoReq, uOffset, cbTransfer);
-                STAM_REL_COUNTER_ADD(&pThis->StatBytesRead, cbTransfer);
             }
             else
@@ -364 +359 @@
                 pThis->pLed->Asserted.s.fWriting = pThis->pLed->Actual.s.fWriting = 1;
                 rc = pThis->pDrvMediaEx->pfnIoReqWrite(pThis->pDrvMediaEx, hIoReq, uOffset, cbTransfer);
-                STAM_REL_COUNTER_ADD(&pThis->StatBytesWritten, cbTransfer);
             }
 
@@ -1254 +1248 @@
         pThis->hVScsiLun    = NULL;
     }
-
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatBytesRead);
-    PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->StatBytesWritten);
-    PDMDrvHlpSTAMDeregister(pDrvIns, (void *)&pThis->StatIoDepth);
 }
 
@@ -1437 +1427 @@
         }
     }
-
-    const char *pszCtrl = NULL;
-    uint32_t iCtrlInstance = 0;
-    uint32_t iCtrlLun = 0;
-
-    rc = pThis->pDevMediaPort->pfnQueryDeviceLocation(pThis->pDevMediaPort, &pszCtrl, &iCtrlInstance, &iCtrlLun);
-    if (RT_SUCCESS(rc))
-    {
-        const char *pszCtrlId =   strcmp(pszCtrl, "Msd") == 0 ? "USB"
-                                : strcmp(pszCtrl, "lsilogicsas") == 0 ? "SAS"
-                                : "SCSI";
-        /* Register statistics counter. */
-        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatBytesRead, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_BYTES,
-                                "Amount of data read.", "/Devices/%s%u/%u/ReadBytes", pszCtrlId, iCtrlInstance, iCtrlLun);
-        PDMDrvHlpSTAMRegisterF(pDrvIns, &pThis->StatBytesWritten, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_BYTES,
-                                "Amount of data written.", "/Devices/%s%u/%u/WrittenBytes", pszCtrlId, iCtrlInstance, iCtrlLun);
-        PDMDrvHlpSTAMRegisterF(pDrvIns, (void *)&pThis->StatIoDepth, STAMTYPE_U32, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT,
-                                "Number of active tasks.", "/Devices/%s%u/%u/IoDepth", pszCtrlId, iCtrlInstance, iCtrlLun);
-    }
-
-    pThis->StatIoDepth = 0;
 
     uint32_t fFeatures = 0;

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -284 +284 @@
      */
     CHECK_MEMBER_ALIGNMENT(AHCI, lock, 8);
-    CHECK_MEMBER_ALIGNMENT(AHCIPort, StatDMA, 8);
+    CHECK_MEMBER_ALIGNMENT(AHCI, ahciPort[0], 8);
 
     CHECK_MEMBER_ALIGNMENT(APICDEV, pDevInsR0, 8);

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1324 +1324 @@
     GEN_CHECK_OFF(AHCIPort, pTaskErr);
     GEN_CHECK_OFF(AHCIPort, hEvtProcess);
-    GEN_CHECK_OFF(AHCIPort, StatDMA);
-    GEN_CHECK_OFF(AHCIPort, StatBytesWritten);
-    GEN_CHECK_OFF(AHCIPort, StatBytesRead);
-    GEN_CHECK_OFF(AHCIPort, StatIORequestsPerSecond);
-#ifdef VBOX_WITH_STATISTICS
-    GEN_CHECK_OFF(AHCIPort, StatProfileProcessTime);
-    GEN_CHECK_OFF(AHCIPort, StatProfileReadWrite);
-#endif
     GEN_CHECK_OFF(AHCIPort, szSerialNumber);
     GEN_CHECK_OFF(AHCIPort, szSerialNumber[AHCI_SERIAL_NUMBER_LENGTH]); /* One additional byte for the termination.*/