Changeset 38644 in vbox for trunk/src/VBox/Storage/Debug

Timestamp:

Sep 5, 2011 4:45:44 PM (14 years ago)

Author:

vboxsync

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

73852

Message:

VDDbg+DrvDiskIntegrity+tstVDIo: Bugfixes and add a I/O log replay action for the scripted I/O testcase

File:

• trunk/src/VBox/Storage/Debug/VDDbgIoLog.cpp (modified) (7 diffs)

trunk/src/VBox/Storage/Debug/VDDbgIoLog.cpp

@@ -98 +98 @@
 {
     /** Event type. */
-    uint8_t     u32Type;
+    uint32_t    u32Type;
     /** Id of the matching start entry. */
     uint64_t    u64Id;
@@ -328 +328 @@
                 pIoLogger->offReadNext  = sizeof(Hdr);
                 pIoLogger->idNext       = RT_LE2H_U64(Hdr.u64Id);
+                *phIoLogger = pIoLogger;
             }
             else if (RT_SUCCESS(rc))
@@ -468 +469 @@
         pIoLogEntry->idStart = pIoLogger->idNext++;
 
-        Entry.u32Type          = VDIOLOG_EVENT_START;
+        Entry.u32Type         = VDIOLOG_EVENT_START;
         Entry.u8AsyncIo       = fAsync ? 1 : 0;
         Entry.u32ReqType      = VDDBGIOLOGREQ_DISCARD;
+        Entry.u64Id           = RT_H2LE_U64(pIoLogEntry->idStart);
         Entry.Discard.cRanges = RT_H2LE_U32(cRanges);
 
@@ -588 +590 @@
         if (RT_SUCCESS(rc))
         {
-            pIoLogger->u32EventTypeNext = (VDIOLOGEVENT)abBuf[0];
+            pIoLogger->u32EventTypeNext = abBuf[0];
             pIoLogger->enmReqTypeNext   = (VDDBGIOLOGREQ)abBuf[1];
         }
@@ -687 +689 @@
         rc = VERR_INVALID_STATE;
 
+    if (RT_SUCCESS(rc))
+        pIoLogger->u32EventTypeNext = 0;
+
     RTSemFastMutexRelease(pIoLogger->hMtx);
     return rc;
@@ -748 +753 @@
         rc = VERR_INVALID_STATE;
 
+    if (RT_SUCCESS(rc))
+        pIoLogger->u32EventTypeNext = 0;
+
     RTSemFastMutexRelease(pIoLogger->hMtx);
     return rc;
@@ -796 +804 @@
         rc = VERR_INVALID_STATE;
 
+    if (RT_SUCCESS(rc))
+        pIoLogger->u32EventTypeNext = 0;
+
     RTSemFastMutexRelease(pIoLogger->hMtx);
     return rc;