Changeset 77832 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 21, 2019 8:41:23 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Spealiced RTFileCopyPartEx and associated prep/cleanup functions for linux copy_file_range(). bugref:9172

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (13 diffs)
• generic/RTFileCopyPartEx-generic.cpp (modified) (5 diffs)
• r3/linux/RTFileCopyPartEx-linux.cpp (added)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -670 +670 @@
         generic/RTFileCopyByHandlesEx-generic.cpp \
         generic/RTFileCopyPart-generic.cpp \
-        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileQuerySize-generic.cpp \
         generic/RTFileReadAll-generic.cpp \
@@ -822 +821 @@
         generic/fileio-sg-generic.cpp \
         generic/fileio-sg-at-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileExists-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
@@ -942 +942 @@
         r3/linux/time-linux.cpp \
         r3/linux/thread-affinity-linux.cpp \
+        r3/linux/RTFileCopyPartEx-linux.cpp \
         r3/linux/RTFileSetAllocationSize-linux.cpp \
         r3/linux/RTProcIsRunningByName-linux.cpp \
@@ -1018 +1019 @@
         generic/fileio-sg-generic.cpp \
         generic/fileio-sg-at-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
@@ -1099 +1101 @@
         generic/RTDirQueryInfo-generic.cpp \
         generic/RTDirSetTimes-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
@@ -1184 +1187 @@
         generic/RTDirQueryInfo-generic.cpp \
         generic/RTDirSetTimes-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
@@ -1267 +1271 @@
         generic/RTDirQueryInfo-generic.cpp \
         generic/RTDirSetTimes-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
@@ -1348 +1353 @@
         generic/RTDirQueryInfo-generic.cpp \
         generic/RTDirSetTimes-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
@@ -1443 +1449 @@
         generic/fileio-sg-generic.cpp \
         generic/fileio-sg-at-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
@@ -1794 +1801 @@
         generic/RTFileCopyEx-generic.cpp \
         generic/RTFileCopyByHandlesEx-generic.cpp \
-        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileQuerySize-generic.cpp \
         generic/RTFileReadAll-generic.cpp \
@@ -1835 +1841 @@
 RuntimeBldProg_SOURCES.darwin = $(filter-out \
         generic/cdrom-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTPathGetCurrentOnDrive-generic.cpp \
@@ -1874 +1881 @@
         generic/RTDirExists-generic.cpp \
         generic/RTDirSetTimes-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileExists-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \
@@ -1942 +1950 @@
         generic/RTDirSetTimes-generic.cpp \
         generic/fileio-at-generic.cpp \
+        generic/RTFileCopyPartEx-generic.cpp \
         generic/RTFileMove-generic.cpp \
         generic/RTFileSetAllocationSize-generic.cpp \

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

@@ -38 +38 @@
 
 
+#ifndef IPRT_FALLBACK_VERSION
 RTDECL(int) RTFileCopyPartPrep(PRTFILECOPYPARTBUFSTATE pBufState, uint64_t cbToCopy)
+#else
+static int rtFileCopyPartPrepFallback(PRTFILECOPYPARTBUFSTATE pBufState, uint64_t cbToCopy)
+#endif
 {
     /*
@@ -71 +75 @@
 
 
+#ifndef IPRT_FALLBACK_VERSION
 RTDECL(void) RTFileCopyPartCleanup(PRTFILECOPYPARTBUFSTATE pBufState)
+#else
+static void rtFileCopyPartCleanupFallback(PRTFILECOPYPARTBUFSTATE pBufState)
+#endif
 {
     AssertReturnVoid(pBufState->uMagic == RTFILECOPYPARTBUFSTATE_MAGIC);
@@ -84 +92 @@
 
 
+#ifndef IPRT_FALLBACK_VERSION
 RTDECL(int) RTFileCopyPartEx(RTFILE hFileSrc, RTFOFF offSrc, RTFILE hFileDst, RTFOFF offDst, uint64_t cbToCopy,
                              uint32_t fFlags, PRTFILECOPYPARTBUFSTATE pBufState, uint64_t *pcbCopied)
+#else
+static int rtFileCopyPartExFallback(RTFILE hFileSrc, RTFOFF offSrc, RTFILE hFileDst, RTFOFF offDst, uint64_t cbToCopy,
+                                    uint32_t fFlags, PRTFILECOPYPARTBUFSTATE pBufState, uint64_t *pcbCopied)
+#endif
 {
     /*
@@ -117 +130 @@
     do
     {
-        size_t cbThisCopy = (size_t)RT_MIN(cbToCopy, pBufState->cbBuf);
+        size_t cbThisCopy = (size_t)RT_MIN(cbToCopy - cbCopied, pBufState->cbBuf);
         size_t cbActual   = 0;
         rc = RTFileReadAt(hFileSrc, offSrc + cbCopied, pBufState->pbBuf, cbThisCopy, &cbActual);
@@ -141 +154 @@
     return rc;
 }
-RT_EXPORT_SYMBOL(RTFileCopyPartEx);