Changeset 59511 in vbox

Timestamp:

Jan 28, 2016 2:02:39 PM (9 years ago)

Author:

vboxsync

Message:

IPRT: RTFileSetAllocationSize() implementation for POSIX compatible systems using posix_fallocate() (used only on Solaris for now)

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r3/posix/RTFileSetAllocationSize-posix.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/linux/RTFileSetAllocationSize-linux.cpp ) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1126 +1126 @@
         generic/RTDirSetTimes-generic.cpp \
         generic/RTFileMove-generic.cpp \
-        generic/RTFileSetAllocationSize-generic.cpp \
         generic/RTLogWriteDebugger-generic.cpp \
         generic/RTPathAbs-generic.cpp \
@@ -1144 +1143 @@
         r3/generic/allocex-r3-generic.cpp \
         r3/posix/RTFileQueryFsSizes-posix.cpp \
+        r3/posix/RTFileSetAllocationSize-posix.cpp \
         r3/posix/RTHandleGetStandard-posix.cpp \
         r3/posix/RTMemProtect-posix.cpp \

trunk/src/VBox/Runtime/r3/posix/RTFileSetAllocationSize-posix.cpp

@@ -39 +39 @@
 #include <errno.h>
 #include <unistd.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 
 /**
- * The Linux specific fallocate() method.
+ * The posix_fallocate() method.
  */
-typedef int (*PFNLNXFALLOCATE) (int iFd, int fMode, off_t offStart, off_t cb);
-/** Flag to specify that the file size should not be extended. */
-#define LNX_FALLOC_FL_KEEP_SIZE 1
+typedef int (*PFNPOSIXFALLOCATE) (int iFd, off_t offStart, off_t cb);
 
 RTDECL(int) RTFileSetAllocationSize(RTFILE hFile, uint64_t cbSize, uint32_t fFlags)
@@ -57 +55 @@
      */
     if (    sizeof(off_t) < sizeof(cbSize)
-        &&  (cbSize >> 32) != 0)
+        &&  RT_HIDWORD(cbSize) != 0)
     {
         AssertMsgFailed(("64-bit filesize not supported! cbSize=%lld\n", cbSize));
@@ -63 +61 @@
     }
 
+    if (fFlags & RTFILE_ALLOC_SIZE_F_KEEP_SIZE)
+        return VERR_NOT_SUPPORTED;
+
     int rc = VINF_SUCCESS;
-    PFNLNXFALLOCATE pfnLnxFAllocate = (PFNLNXFALLOCATE)(uintptr_t)dlsym(RTLD_DEFAULT, "fallocate");
-    if (VALID_PTR(pfnLnxFAllocate))
+    PFNPOSIXFALLOCATE pfnPosixFAllocate = (PFNPOSIXFALLOCATE)(uintptr_t)dlsym(RTLD_DEFAULT, "posix_fallocate");
+    if (VALID_PTR(pfnPosixFAllocate))
     {
-        int fLnxFlags = (fFlags & RTFILE_ALLOC_SIZE_F_KEEP_SIZE) ? LNX_FALLOC_FL_KEEP_SIZE : 0;
-        int rcLnx = pfnLnxFAllocate(RTFileToNative(hFile), fLnxFlags, 0, cbSize);
-        if (rcLnx != 0)
+        int rcPosix = pfnPosixFAllocate(RTFileToNative(hFile), 0, cbSize);
+        if (rcPosix != 0)
         {
             if (errno == EOPNOTSUPP)