Changeset 72336 in vbox for trunk/src/VBox

Timestamp:

May 25, 2018 9:59:14 AM (7 years ago)

Author:

vboxsync

Message:

DrvDiskIntegrity: Add async flag to indicate whether a request used the sync or async path

File:

• trunk/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp (modified) (11 diffs)

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

@@ -220 +220 @@
 static const RTTRACELOGEVTITEMDESC g_aEvtItemsReadWrite[] =
 {
-    { "Offset", "Offset to start reading/writing from/to", RTTRACELOGTYPE_UINT64, 0 },
-    { "Size",   "Number of bytes to transfer",             RTTRACELOGTYPE_SIZE,   0 }
+    { "Async",  "Flag whether the request is asynchronous", RTTRACELOGTYPE_BOOL,   0 },
+    { "Offset", "Offset to start reading/writing from/to",  RTTRACELOGTYPE_UINT64, 0 },
+    { "Size",   "Number of bytes to transfer",              RTTRACELOGTYPE_SIZE,   0 }
+};
+
+/**
+ * Flush event items.
+ */
+static const RTTRACELOGEVTITEMDESC g_aEvtItemsFlush[] =
+{
+    { "Async",  "Flag whether the request is asynchronous", RTTRACELOGTYPE_BOOL,   0 }
 };
 
@@ -240 +249 @@
 /** Flush event descriptor. */
 static const RTTRACELOGEVTDESC g_EvtFlush =
-    { "Flush", "Flush written data to disk", RTTRACELOGEVTSEVERITY_DEBUG, 0, NULL };
+    { "Flush", "Flush written data to disk", RTTRACELOGEVTSEVERITY_DEBUG, RT_ELEMENTS(g_aEvtItemsFlush), &g_aEvtItemsFlush[0] };
 /** I/O request complete event descriptor. */
 static const RTTRACELOGEVTDESC g_EvtComplete =
@@ -756 +765 @@
  * @param   pThis    The driver instance data.
  * @param   uGrp     The group ID.
+ * @param   fAsync   Flag whether this is an async request.
  * @param   off      The offset to put into the event log.
  * @param   cbRead   Amount of bytes to read.
  */
-DECLINLINE(void) drvdiskintTraceLogFireEvtRead(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, uint64_t off, size_t cbRead)
+DECLINLINE(void) drvdiskintTraceLogFireEvtRead(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, bool fAsync, uint64_t off, size_t cbRead)
 {
     if (pThis->hIoLogger)
     {
         int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtRead, RTTRACELOG_WR_ADD_EVT_F_GRP_START,
-                                     (RTTRACELOGEVTGRPID)uGrp, 0, off, cbRead);
+                                     (RTTRACELOGEVTGRPID)uGrp, 0, fAsync, off, cbRead);
         AssertRC(rc);
     }
@@ -776 +786 @@
  * @param   pThis    The driver instance data.
  * @param   uGrp     The group ID.
+ * @param   fAsync   Flag whether this is an async request.
  * @param   off      The offset to put into the event log.
  * @param   cbWrite  Amount of bytes to write.
  */
-DECLINLINE(void) drvdiskintTraceLogFireEvtWrite(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, uint64_t off, size_t cbWrite)
+DECLINLINE(void) drvdiskintTraceLogFireEvtWrite(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, bool fAsync, uint64_t off, size_t cbWrite)
 {
     if (pThis->hIoLogger)
@@ -796 +807 @@
  * @param   pThis    The driver instance data.
  * @param   uGrp     The group ID.
- */
-DECLINLINE(void) drvdiskintTraceLogFireEvtFlush(PDRVDISKINTEGRITY pThis, uintptr_t uGrp)
+ * @param   fAsync   Flag whether this is an async request.
+ */
+DECLINLINE(void) drvdiskintTraceLogFireEvtFlush(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, bool fAsync)
 {
     if (pThis->hIoLogger)
@@ -848 +860 @@
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
 
-    drvdiskintTraceLogFireEvtRead(pThis, (uintptr_t)pvBuf, off, cbRead);
+    drvdiskintTraceLogFireEvtRead(pThis, (uintptr_t)pvBuf, false /* fAsync */, off, cbRead);
     rc = pThis->pDrvMedia->pfnRead(pThis->pDrvMedia, off, pvBuf, cbRead);
 
@@ -885 +897 @@
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
 
-    drvdiskintTraceLogFireEvtWrite(pThis, (uintptr_t)pvBuf, off, cbWrite);
+    drvdiskintTraceLogFireEvtWrite(pThis, (uintptr_t)pvBuf, false /* fAsync */, off, cbWrite);
 
     if (pThis->fRecordWriteBeforeCompletion)
@@ -923 +935 @@
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
 
-    drvdiskintTraceLogFireEvtFlush(pThis, 1);
+    drvdiskintTraceLogFireEvtFlush(pThis, 1, false /* fAsync */);
     rc = pThis->pDrvMedia->pfnFlush(pThis->pDrvMedia);
     drvdiskintTraceLogFireEvtComplete(pThis, 1, rc, NULL);
@@ -1421 +1433 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
-    drvdiskintTraceLogFireEvtRead(pThis, (uintptr_t)hIoReq, off, cbRead);
+    drvdiskintTraceLogFireEvtRead(pThis, (uintptr_t)hIoReq, true /* fAsync */, off, cbRead);
     int rc = pThis->pDrvMediaEx->pfnIoReqRead(pThis->pDrvMediaEx, hIoReq, off, cbRead);
     if (rc == VINF_SUCCESS)
@@ -1489 +1501 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
-    drvdiskintTraceLogFireEvtWrite(pThis, (uintptr_t)hIoReq, off, cbWrite);
+    drvdiskintTraceLogFireEvtWrite(pThis, (uintptr_t)hIoReq, true /* fAsync */, off, cbWrite);
     if (pThis->fRecordWriteBeforeCompletion)
     {
@@ -1536 +1548 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
-    drvdiskintTraceLogFireEvtFlush(pThis, (uintptr_t)hIoReq);
+    drvdiskintTraceLogFireEvtFlush(pThis, (uintptr_t)hIoReq, true /* fAsync */);
     int rc = pThis->pDrvMediaEx->pfnIoReqFlush(pThis->pDrvMediaEx, hIoReq);
     if (rc == VINF_SUCCESS)