Changeset 64016 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 26, 2016 3:14:48 PM (8 years ago)

Author:

vboxsync

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

110932

Message:

AHCI: Remove tsStart from the request structure as the functionaliyt is already managed by the driver below

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevAHCI.cpp (modified) (7 diffs)
• build/VBoxDD.d (modified) (1 diff)

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

@@ -69 +69 @@
 #else
 # define VBOXDD_AHCI_REQ_SUBMIT(a,b,c,d)           do { } while (0)
-# define VBOXDD_AHCI_REQ_SUBMIT_TIMESTAMP(a,b)     do { } while (0)
 # define VBOXDD_AHCI_REQ_COMPLETED(a,b,c,d)        do { } while (0)
-# define VBOXDD_AHCI_REQ_COMPLETED_TIMESTAMP(a,b)  do { } while (0)
 #endif
 
@@ -263 +261 @@
     /** The I/O request handle from the driver below associated with this request. */
     PDMMEDIAEXIOREQ            hIoReq;
-    /** Start timestamp of the request. */
-    uint64_t                   tsStart;
     /** Tag of the task. */
     uint32_t                   uTag;
@@ -5900 +5896 @@
     bool fRedo = false;
     bool fCanceled = false;
-    uint64_t tsNow = RTTimeMilliTS();
 
     LogFlowFunc(("pAhciPort=%p pAhciReq=%p rcReq=%d\n",
@@ -5906 +5901 @@
 
     VBOXDD_AHCI_REQ_COMPLETED(pAhciReq, rcReq, pAhciReq->uOffset, pAhciReq->cbTransfer);
-    VBOXDD_AHCI_REQ_COMPLETED_TIMESTAMP(pAhciReq, tsNow);
 
     /*
@@ -5915 +5909 @@
      */
     bool fReqErrSaved = false;
-
-    /*
-     * Leave a release log entry if the request was active for more than 25 seconds
-     * (30 seconds is the timeout of the guest).
-     */
-    if (tsNow - pAhciReq->tsStart >= 25 * 1000)
-    {
-        const char *pcszReq = NULL;
-
-        switch (pAhciReq->enmType)
-        {
-            case PDMMEDIAEXIOREQTYPE_READ:
-                pcszReq = "Read";
-                break;
-            case PDMMEDIAEXIOREQTYPE_WRITE:
-                pcszReq = "Write";
-                break;
-            case PDMMEDIAEXIOREQTYPE_FLUSH:
-                pcszReq = "Flush";
-                break;
-            case PDMMEDIAEXIOREQTYPE_DISCARD:
-                pcszReq = "Trim";
-                break;
-            default:
-                pcszReq = "<Invalid>";
-        }
-
-        LogRel(("AHCI#%uP%u: %s request was active for %llu seconds\n",
-                pAhciPort->CTX_SUFF(pDevIns)->iInstance, pAhciPort->iLUN, pcszReq, (tsNow - pAhciReq->tsStart) / 1000));
-    }
 
     if (rcReq != VERR_PDM_MEDIAEX_IOREQ_CANCELED)
@@ -6556 +6520 @@
 
     VBOXDD_AHCI_REQ_SUBMIT(pAhciReq, pAhciReq->enmType, pAhciReq->uOffset, pAhciReq->cbTransfer);
-    VBOXDD_AHCI_REQ_SUBMIT_TIMESTAMP(pAhciReq, pAhciReq->tsStart);
 
     if (enmType == PDMMEDIAEXIOREQTYPE_FLUSH)
@@ -6606 +6569 @@
 static bool ahciR3CmdPrepare(PAHCIPort pAhciPort, PAHCIREQ pAhciReq)
 {
-    pAhciReq->tsStart = RTTimeMilliTS();
-
     /* Set current command slot */
     ASMAtomicWriteU32(&pAhciPort->u32CurrentCommandSlot, pAhciReq->uTag);

trunk/src/VBox/Devices/build/VBoxDD.d

@@ -24 +24 @@
 
     probe ahci__req__submit(void *pvReq, int iTxDir, uint64_t offStart, uint32_t cbXfer);
-    probe ahci__req__submit__timestamp(void *pvReq, uint64_t tsStart);
     probe ahci__req__completed(void *pvReq, int rcReq, uint64_t offStart, uint32_t cbXfer);
-    probe ahci__req__completed__timestamp(void *pvReq, uint64_t tsEnd);
 };