Changeset 33235 in vbox

Timestamp:

Oct 19, 2010 3:14:06 PM (14 years ago)

Author:

vboxsync

Message:

Storage/vbox-img: implement stdout handling

File:

• trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -254 +254 @@
 typedef struct FILEIOSTATE
 {
+    RTFILE file;
     /** Offset in the file. */
     uint64_t off;
@@ -273 +274 @@
     AssertPtrNullReturn(pfnCompleted, VERR_INVALID_PARAMETER);
     AssertReturn((fOpen & RTFILE_O_ACCESS_MASK) == RTFILE_O_READ, VERR_INVALID_PARAMETER);
-
+    RTFILE file;
+    int rc = RTFileFromNative(&file, RTFILE_NATIVE_STDIN);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* No need to clear the buffer, the data will be read from disk. */
     PFILEIOSTATE pFS = (PFILEIOSTATE)RTMemAlloc(sizeof(FILEIOSTATE));
     if (!pFS)
         return VERR_NO_MEMORY;
 
+    pFS->file = file;
     pFS->off = 0;
     pFS->offBuffer = UINT64_MAX;
@@ -290 +297 @@
     NOREF(pvUser);
     AssertPtrReturn(pStorage, VERR_INVALID_POINTER);
-
     PFILEIOSTATE pFS = (PFILEIOSTATE)pStorage;
 
@@ -369 +375 @@
         do
         {
-            rc = RTFileRead(0, pTmp, cbTmp, &cbRead);
+            rc = RTFileRead(pFS->file, pTmp, cbTmp, &cbRead);
             if (RT_FAILURE(rc))
                 return rc;
@@ -401 +407 @@
             do
             {
-                rc = RTFileRead(0, pTmp, cbTmp, &cbRead);
+                rc = RTFileRead(pFS->file, pTmp, cbTmp, &cbRead);
                 if (RT_FAILURE(rc))
                     return rc;
@@ -460 +466 @@
     AssertPtrNullReturn(pfnCompleted, VERR_INVALID_PARAMETER);
     AssertReturn((fOpen & RTFILE_O_ACCESS_MASK) == RTFILE_O_WRITE, VERR_INVALID_PARAMETER);
-
-    PFILEIOSTATE pFS = (PFILEIOSTATE)RTMemAlloc(sizeof(FILEIOSTATE));
+    RTFILE file;
+    int rc = RTFileFromNative(&file, RTFILE_NATIVE_STDOUT);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* Must clear buffer, so that skipped over data is initialized properly. */
+    PFILEIOSTATE pFS = (PFILEIOSTATE)RTMemAllocZ(sizeof(FILEIOSTATE));
     if (!pFS)
         return VERR_NO_MEMORY;
 
+    pFS->file = file;
     pFS->off = 0;
-    pFS->offBuffer = UINT64_MAX;
-    pFS->cbBuffer = 0;
+    pFS->offBuffer = 0;
+    pFS->cbBuffer = sizeof(FILEIOSTATE);
 
     *ppStorage = pFS;
@@ -477 +489 @@
     NOREF(pvUser);
     AssertPtrReturn(pStorage, VERR_INVALID_POINTER);
-
     PFILEIOSTATE pFS = (PFILEIOSTATE)pStorage;
+    int rc = VINF_SUCCESS;
+
+    /* Flush any remaining buffer contents. */
+    if (pFS->cbBuffer)
+        rc = RTFileWrite(pFS->file, &pFS->abBuffer[0], pFS->cbBuffer, NULL);
 
     RTMemFree(pFS);
 
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -554 +570 @@
 {
     NOREF(pvUser);
-    NOREF(pStorage);
-    NOREF(uOffset);
-    NOREF(cbBuffer);
-    NOREF(pcbWritten);
+    AssertPtrReturn(pStorage, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuffer, VERR_INVALID_POINTER);
-    AssertFailedReturn(VERR_NOT_SUPPORTED);
+    PFILEIOSTATE pFS = (PFILEIOSTATE)pStorage;
+    AssertReturn(uOffset >= pFS->off, VERR_INVALID_PARAMETER);
+    int rc;
+
+    /* Write the data to the buffer, flushing as required. */
+    size_t cbTotalWritten = 0;
+    do
+    {
+        /* Flush the buffer if we need a new one. */
+        while (uOffset > pFS->offBuffer + sizeof(pFS->abBuffer) - 1)
+        {
+            rc = RTFileWrite(pFS->file, &pFS->abBuffer[0],
+                             sizeof(pFS->abBuffer), NULL);
+            RT_ZERO(pFS->abBuffer);
+            pFS->offBuffer += sizeof(pFS->abBuffer);
+            pFS->cbBuffer = 0;
+        }
+
+        uint32_t cbThisWrite = RT_MIN(cbBuffer,
+                                      sizeof(pFS->abBuffer) - uOffset % sizeof(pFS->abBuffer));
+        memcpy(&pFS->abBuffer[uOffset % sizeof(pFS->abBuffer)], pvBuffer,
+               cbThisWrite);
+        uOffset += cbThisWrite;
+        pvBuffer = (uint8_t *)pvBuffer + cbThisWrite;
+        cbBuffer -= cbThisWrite;
+        cbTotalWritten += cbThisWrite;
+    } while (cbBuffer > 0);
+
+    if (pcbWritten)
+        *pcbWritten = cbTotalWritten;
+
+    pFS->cbBuffer = uOffset % sizeof(pFS->abBuffer);
+    if (!pFS->cbBuffer)
+        pFS->cbBuffer = sizeof(pFS->abBuffer);
+    pFS->off = uOffset;
+
+    return VINF_SUCCESS;
 }