Changeset 28688 in vbox

Timestamp:

Apr 24, 2010 6:12:55 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: Added RTDirFlush and RTDirFlushParent.

Location:

trunk

Files:

• include/iprt/dir.h (modified) (1 diff)
• src/VBox/Runtime/r3/dir.cpp (modified) (3 diffs)
• src/VBox/Runtime/r3/posix/dir-posix.cpp (modified) (3 diffs)
• src/VBox/Runtime/r3/win/dir-win.cpp (modified) (1 diff)

trunk/include/iprt/dir.h

@@ -125 +125 @@
 #define RTDIRRMREC_F_VALID_MASK     UINT32_C(0x00000001)
 /** @} */
+
+/**
+ * Flushes the specified directory.
+ *
+ * This API is not implemented on all systems.  On some systems it may be
+ * unnecessary if you've already flushed the file.  If you really care for your
+ * data and is entering dangerous territories, it doesn't hurt calling it after
+ * flushing and closing the file.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_NOT_IMPLEMENTED must be expected.
+ * @retval  VERR_NOT_SUPPORTED must be expected.
+ * @param   pszPath     Path to the directory.
+ */
+RTDECL(int) RTDirFlush(const char *pszPath);
+
+/**
+ * Flushes the parent directory of the specified file.
+ *
+ * This is just a wrapper around RTDirFlush.
+ *
+ * @returns IPRT status code, see RTDirFlush for details.
+ * @param   pszChild    Path to the file which parent should be flushed.
+ */
+RTDECL(int) RTDirFlushParent(const char *pszChild);
 
 

trunk/src/VBox/Runtime/r3/dir.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
 
 #include <iprt/dir.h>
+#include "internal/iprt.h"
+
+#include <iprt/assert.h>
 #include <iprt/file.h>
+#include <iprt/err.h>
+#include <iprt/log.h>
+#include <iprt/mem.h>
+#include <iprt/param.h>
 #include <iprt/path.h>
-#include <iprt/alloc.h>
-#include <iprt/log.h>
-#include <iprt/param.h>
 #include <iprt/string.h>
-#include <iprt/err.h>
-#include <iprt/assert.h>
 #include <iprt/uni.h>
 #include "internal/dir.h"
@@ -865 +867 @@
 }
 
+
+RTDECL(int) RTDirFlushParent(const char *pszChild)
+{
+    char szPath[RTPATH_MAX];
+    int rc = RTStrCopy(szPath, sizeof(szPath), pszChild);
+    if (RT_SUCCESS(rc))
+    {
+        RTPathStripFilename(szPath);
+        rc = RTDirFlush(szPath);
+    }
+    return rc;
+}
+

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
 
 #include <iprt/dir.h>
-#include <iprt/path.h>
-#include <iprt/alloc.h>
+#include "internal/iprt.h"
+
 #include <iprt/alloca.h>
-#include <iprt/string.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
 #include <iprt/log.h>
+#include <iprt/mem.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
+#include <iprt/string.h>
 #include "internal/dir.h"
 #include "internal/fs.h"
@@ -134 +139 @@
 
     LogFlow(("RTDirRemove(%p={%s}): returns %Rrc\n", pszPath, pszPath, rc));
+    return rc;
+}
+
+
+RTDECL(int) RTDirFlush(const char *pszPath)
+{
+    /*
+     * Linux: The fsync() man page hints at this being required for ensuring
+     * consistency between directory and file in case of a crash.
+     *
+     * Solaris: No mentioned is made of directories on the fsync man page.
+     * While rename+fsync will do what we want on ZFS, the code needs more
+     * careful studying wrt whether the directory entry of a new file is
+     * implicitly synced when the file is synced (it's very likely for ZFS).
+     *
+     * FreeBSD: The FFS fsync code seems to flush the directory entry as well
+     * in some cases.  Don't know exactly what's up with rename, but from the
+     * look of things fsync(dir) should work.
+     */
+    int rc;
+    int fd = open(pszPath, O_DIRECTORY | O_RDONLY, 0);
+    if (fd >= 0)
+    {
+        if (fsync(fd) == 0)
+            rc = VINF_SUCCESS;
+        else
+            rc = RTErrConvertFromErrno(errno);
+        close(fd);
+    }
+    else
+        rc = RTErrConvertFromErrno(errno);
     return rc;
 }

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

@@ -128 +128 @@
 
 
+RTDECL(int) RTDirFlush(const char *pszPath)
+{
+    return VERR_NOT_SUPPORTED;
+}
+
+
 int rtOpenDirNative(PRTDIR pDir, char *pszPathBuf)
 {