Changeset 77830 in vbox for trunk/src/VBox

Timestamp:

Mar 21, 2019 6:07:40 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Reimplemented RTFileCopyByHandlesEx against RTFileCopyPartEx, adding RTFileCopyAttributes for copying attributes. bugref:9172

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• generic/RTFileCopyAttributes-generic.cpp (added)
• generic/RTFileCopyByHandlesEx-generic.cpp (modified) (2 diffs)
• generic/RTFileCopyPart-generic.cpp (moved) (moved from trunk/src/VBox/Runtime/generic/RTFileCopyRange-generic.cpp )
• generic/RTFileCopyPartEx-generic.cpp (moved) (moved from trunk/src/VBox/Runtime/generic/RTFileCopyRangeEx-generic.cpp )

trunk/src/VBox/Runtime/Makefile.kmk

@@ -666 +666 @@
         generic/RTEnvDupEx-generic.cpp \
         generic/RTFileCopy-generic.cpp \
+        generic/RTFileCopyAttributes-generic.cpp \
         generic/RTFileCopyEx-generic.cpp \
         generic/RTFileCopyByHandlesEx-generic.cpp \
-        generic/RTFileCopyRange-generic.cpp \
-        generic/RTFileCopyRangeEx-generic.cpp \
+        generic/RTFileCopyPart-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileQuerySize-generic.cpp \
         generic/RTFileReadAll-generic.cpp \
@@ -1790 +1791 @@
         generic/RTEnvDupEx-generic.cpp \
         generic/RTFileCopy-generic.cpp \
+        generic/RTFileCopyAttributes-generic.cpp \
         generic/RTFileCopyEx-generic.cpp \
         generic/RTFileCopyByHandlesEx-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileQuerySize-generic.cpp \
         generic/RTFileReadAll-generic.cpp \

trunk/src/VBox/Runtime/generic/RTFileCopyByHandlesEx-generic.cpp

@@ -38 +38 @@
 
 
-RTDECL(int) RTFileCopyByHandlesEx(RTFILE FileSrc, RTFILE FileDst, PFNRTPROGRESS pfnProgress, void *pvUser)
+RTDECL(int) RTFileCopyByHandlesEx(RTFILE hFileSrc, RTFILE hFileDst, PFNRTPROGRESS pfnProgress, void *pvUser)
 {
     /*
      * Validate input.
      */
-    AssertMsgReturn(RTFileIsValid(FileSrc), ("FileSrc=%RTfile\n", FileSrc), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(RTFileIsValid(FileDst), ("FileDst=%RTfile\n", FileDst), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(RTFileIsValid(hFileSrc), ("hFileSrc=%RTfile\n", hFileSrc), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(RTFileIsValid(hFileDst), ("hFileDst=%RTfile\n", hFileDst), VERR_INVALID_PARAMETER);
     AssertMsgReturn(!pfnProgress || VALID_PTR(pfnProgress), ("pfnProgress=%p\n", pfnProgress), VERR_INVALID_PARAMETER);
 
@@ -50 +50 @@
      * Save file offset.
      */
-    RTFOFF offSrcSaved;
-    int rc = RTFileSeek(FileSrc, 0, RTFILE_SEEK_CURRENT, (uint64_t *)&offSrcSaved);
+    uint64_t offSrcSaved;
+    int rc = RTFileSeek(hFileSrc, 0, RTFILE_SEEK_CURRENT, &offSrcSaved);
     if (RT_FAILURE(rc))
         return rc;
 
     /*
-     * Get the file size.
+     * Get the file size and figure out how much we'll copy at a time.
      */
-    RTFOFF cbSrc;
-    rc = RTFileSeek(FileSrc, 0, RTFILE_SEEK_END, (uint64_t *)&cbSrc);
+    uint64_t cbSrc;
+    rc = RTFileGetSize(hFileSrc, &cbSrc);
     if (RT_FAILURE(rc))
         return rc;
 
+    uint64_t cbChunk = cbSrc;
+    if (pfnProgress && cbSrc > _1M)
+    {
+        cbChunk /= 100;
+        if (cbChunk > _64M)
+            cbChunk = RT_ALIGN_64(cbChunk, _2M);
+        else
+            cbChunk = RT_ALIGN_64(cbChunk, _128K);
+    }
+
     /*
-     * Allocate buffer.
+     * Prepare buffers.
      */
-    size_t      cbBuf;
-    uint8_t    *pbBufFree = NULL;
-    uint8_t    *pbBuf;
-    if (cbSrc < _512K)
-    {
-        cbBuf = 8*_1K;
-        pbBuf = (uint8_t *)alloca(cbBuf);
-    }
-    else
-    {
-        cbBuf = _128K;
-        pbBuf = pbBufFree = (uint8_t *)RTMemTmpAlloc(cbBuf);
-    }
-    if (pbBuf)
+    RTFILECOPYPARTBUFSTATE BufState;
+    rc = RTFileCopyPartPrep(&BufState, cbChunk);
+    if (RT_SUCCESS(rc))
     {
         /*
-         * Seek to the start of each file
-         * and set the size of the destination file.
+         * Prepare the destination file.
          */
-        rc = RTFileSeek(FileSrc, 0, RTFILE_SEEK_BEGIN, NULL);
+        uint64_t cbDst;
+        rc = RTFileGetSize(hFileDst, &cbDst);
+        if (RT_SUCCESS(rc) && cbDst > cbSrc)
+            rc = RTFileSetSize(hFileDst, cbSrc);
+        if (RT_SUCCESS(rc) && cbDst < cbSrc)
+        {
+            rc = RTFileSetAllocationSize(hFileDst, cbSrc, RTFILE_ALLOC_SIZE_F_DEFAULT);
+            if (rc == VERR_NOT_SUPPORTED)
+                rc = RTFileSetSize(hFileDst, cbSrc);
+        }
         if (RT_SUCCESS(rc))
         {
-            rc = RTFileSeek(FileDst, 0, RTFILE_SEEK_BEGIN, NULL);
-            if (RT_SUCCESS(rc))
-                rc = RTFileSetSize(FileDst, cbSrc);
-            if (RT_SUCCESS(rc) && pfnProgress)
-                rc = pfnProgress(0, pvUser);
-            if (RT_SUCCESS(rc))
+            /*
+             * Copy loop that works till we reach EOF.
+             */
+            RTFOFF      off            = 0;
+            RTFOFF      cbPercent      = cbSrc / 100;
+            RTFOFF      offNextPercent = pfnProgress ? cbPercent : RTFOFF_MAX;
+            unsigned    uPercentage    = pfnProgress ? 0         : 100;
+            for (;;)
             {
                 /*
-                 * Copy loop.
+                 * Copy a block.
                  */
-                unsigned    uPercentage = 0;
-                RTFOFF      off = 0;
-                RTFOFF      cbPercent = cbSrc / 100;
-                RTFOFF      offNextPercent = cbPercent;
-                while (off < cbSrc)
+                uint64_t cbCopied = 0;
+                rc = RTFileCopyPartEx(hFileSrc, off, hFileDst, off, cbChunk, 0 /*fFlags*/, &BufState, &cbCopied);
+                if (RT_FAILURE(rc))
+                    break;
+                if (cbCopied == 0)
                 {
-                    /* copy block */
-                    RTFOFF cbLeft = cbSrc - off;
-                    size_t cbBlock = cbLeft >= (RTFOFF)cbBuf ? cbBuf : (size_t)cbLeft;
-                    rc = RTFileRead(FileSrc, pbBuf, cbBlock, NULL);
+                    /*
+                     * We reached the EOF.  Complete the copy operation.
+                     */
+                    rc = RTFileSetSize(hFileDst, off);
+                    if (RT_SUCCESS(rc))
+                        rc = RTFileCopyAttributes(hFileSrc, hFileDst, 0);
+                    break;
+                }
+
+                /*
+                 * Advance and work the progress callback.
+                 */
+                off += cbCopied;
+                if (   off >= offNextPercent
+                    && pfnProgress
+                    && uPercentage < 99)
+                {
+                    do
+                    {
+                        uPercentage++;
+                        offNextPercent += cbPercent;
+                    } while (   offNextPercent <= off
+                             && uPercentage < 99);
+                    rc = pfnProgress(uPercentage, pvUser);
                     if (RT_FAILURE(rc))
                         break;
-                    rc = RTFileWrite(FileDst, pbBuf, cbBlock, NULL);
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    /* advance */
-                    off += cbBlock;
-                    if (pfnProgress && offNextPercent < off && uPercentage < 100)
-                    {
-                        do
-                        {
-                            uPercentage++;
-                            offNextPercent += cbPercent;
-                        } while (offNextPercent < off && uPercentage < 100);
-                        rc = pfnProgress(uPercentage, pvUser);
-                        if (RT_FAILURE(rc))
-                            break;
-                    }
                 }
-
-#if 0
-                /*
-                 * Copy OS specific data (EAs and stuff).
-                 */
-                rtFileCopyOSStuff(FileSrc, FileDst);
-#endif
-
-                /* 100% */
-                if (pfnProgress && uPercentage < 100 && RT_SUCCESS(rc))
-                    rc = pfnProgress(100, pvUser);
             }
         }
-        RTMemTmpFree(pbBufFree);
+
+        RTFileCopyPartCleanup(&BufState);
+
+        /*
+         * 100%.
+         */
+        if (   pfnProgress
+            && RT_SUCCESS(rc))
+            rc = pfnProgress(100, pvUser);
     }
-    else
-        rc = VERR_NO_MEMORY;
 
     /*
      * Restore source position.
      */
-    RTFileSeek(FileSrc, offSrcSaved, RTFILE_SEEK_BEGIN, NULL);
-
+    RTFileSeek(hFileSrc, offSrcSaved, RTFILE_SEEK_BEGIN, NULL);
     return rc;
 }