Changeset 21493 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jul 10, 2009 7:58:31 PM (16 years ago)

Author:

vboxsync

Message:

Runtime/File: Add flag to disable the file cache

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/fileio-posix.cpp (modified) (2 diffs)
• win/fileio-win.cpp (modified) (1 diff)

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

@@ -148 +148 @@
         fOpenMode |= O_DIRECT;
 #endif
+#if defined(O_DIRECT) && (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD))
+    /* Disable the kernel cache. */
+    if (fOpen & RTFILE_O_NO_CACHE)
+        fOpenMode |= O_DIRECT;
+#endif
 
     /* create/truncate file */
@@ -204 +209 @@
             ||  fcntl(fh, F_SETFD, FD_CLOEXEC) >= 0)
         {
-            *pFile = (RTFILE)fh;
-            Assert((int)*pFile == fh);
-            LogFlow(("RTFileOpen(%p:{%RTfile}, %p:{%s}, %#x): returns %Rrc\n",
-                     pFile, *pFile, pszFilename, pszFilename, fOpen, rc));
-            return VINF_SUCCESS;
+#if defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
+            iErr = 0;
+            /* Switch direct I/O on now if requested */
+            if (fOpen & RTFILE_O_NO_CACHE)
+# if defined(RT_OS_SOLARIS)
+                iErr = directio(fh, DIRECTIO_ON);
+# elif defined(RT_OS_DARWIN)
+                iErr = fcntl(fh, F_NOCACHE);
+# endif
+            if (iErr < 0)
+                iErr = errno;
+            else
+#endif
+            {
+                *pFile = (RTFILE)fh;
+                Assert((int)*pFile == fh);
+                LogFlow(("RTFileOpen(%p:{%RTfile}, %p:{%s}, %#x): returns %Rrc\n",
+                         pFile, *pFile, pszFilename, pszFilename, fOpen, rc));
+                return VINF_SUCCESS;
+            }
         }
         iErr = errno;

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -263 +263 @@
     if (fOpen & RTFILE_O_ASYNC_IO)
         dwFlagsAndAttributes |= FILE_FLAG_OVERLAPPED;
+    if (fOpen & RTFILE_O_NO_CACHE)
+        dwFlagsAndAttributes |= FILE_FLAG_NO_BUFFERING;
 
     /*