Changeset 77047 in vbox

Timestamp:

Jan 30, 2019 3:38:53 PM (6 years ago)

Author:

vboxsync

Message:

iprt/isomaker: Optimized native handle (file descriptor) usage when adding real directories.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (2 diffs)
• include/iprt/vfs.h (modified) (1 diff)
• include/iprt/vfslowlevel.h (modified) (1 diff)
• src/VBox/Runtime/common/fs/isomakercmd.cpp (modified) (7 diffs)
• src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (1 diff)
• src/VBox/Runtime/common/vfs/vfsstddir.cpp (modified) (1 diff)

trunk/include/iprt/mangling.h

@@ -809 +809 @@
 # define RTVfsDirFromRTDir                              RT_MANGLER(RTVfsDirFromRTDir)
 # define RTVfsDirOpenNormal                             RT_MANGLER(RTVfsDirOpenNormal)
+# define RTVfsDirIsStdDir                               RT_MANGLER(RTVfsDirIsStdDir)
 # define RTDvmCreate                                    RT_MANGLER(RTDvmCreate)
 # define RTDvmCreateFromVfsFile                         RT_MANGLER(RTDvmCreateFromVfsFile)
@@ -2575 +2576 @@
 # define RTVfsDirRemoveDir                              RT_MANGLER(RTVfsDirRemoveDir)
 # define RTVfsDirSetPathMode                            RT_MANGLER(RTVfsDirSetPathMode)
+# define RTVfsDirToPrivate                              RT_MANGLER(RTVfsDirToPrivate)
 # define RTVfsFileFlush                                 RT_MANGLER(RTVfsFileFlush)
 # define RTVfsFileFromBuffer                            RT_MANGLER(RTVfsFileFromBuffer)

trunk/include/iprt/vfs.h

@@ -686 +686 @@
 RTDECL(int) RTVfsDirOpenNormal(const char *pszPath, uint32_t fFlags, PRTVFSDIR phVfsDir);
 
+/** Checks if @a hVfsDir was opened using RTVfsDirOpenNormal() or
+ *  RTVfsDirFromRTDir(), either directly or indirectly. */
+RTDECL(bool) RTVfsDirIsStdDir(RTVFSDIR hVfsDir);
+
 /**
  * Queries information about a object in or under the given directory.

trunk/include/iprt/vfslowlevel.h

@@ -761 +761 @@
 #define RTVFSDIR_F_NO_VFS_REF   RT_BIT_32(0)
 /** @} */
+
+/**
+ * Gets the private data of a directory.
+ *
+ * @returns Pointer to the private data.  NULL if the handle is invalid in some
+ *          way.
+ * @param   hVfsDir             The directory handle.
+ * @param   pDirOps             The directory operations.  This servers as a
+ *                              sort of password.
+ */
+RTDECL(void *) RTVfsDirToPrivate(RTVFSDIR hVfsDir, PCRTVFSDIROPS pDirOps);
 
 

trunk/src/VBox/Runtime/common/fs/isomakercmd.cpp

@@ -1704 +1704 @@
  * @param   cDepth              Number of recursions.  Used to deal with loopy
  *                              directories.
+ * @param   fFilesWithSrcPath   Whether to add files using @a pszSrc or to add
+ *                              as VFS handles (open first). For saving native
+ *                              file descriptors.
  */
 static int rtFsIsoMakerCmdAddVfsDirRecursive(PRTFSISOMAKERCMDOPTS pOpts, RTVFSDIR hVfsDir, uint32_t idxDirObj,
-                                             char *pszSrc, size_t cchSrc, uint32_t fNamespaces, uint8_t cDepth)
+                                             char *pszSrc, size_t cchSrc, uint32_t fNamespaces, uint8_t cDepth,
+                                             bool fFilesWithSrcPath)
 {
     /*
@@ -1775 +1779 @@
                 {
                     /*
-                     * Files are added with VFS file sources.
-                     * The ASSUMPTION is that we're working with a virtual file system
-                     * here and won't be wasting native file descriptors.
+                     * Files are either added with VFS handles or paths to the sources,
+                     * depending on what's considered more efficient.  We prefer the latter
+                     * if hVfsDir maps to native handle and not a virtual one.
                      */
-                    RTVFSFILE hVfsFileSrc;
-                    rc = RTVfsDirOpenFile(hVfsDir, pDirEntry->szName,
-                                          RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, &hVfsFileSrc);
+                    if (!fFilesWithSrcPath)
+                    {
+                        RTVFSFILE hVfsFileSrc;
+                        rc = RTVfsDirOpenFile(hVfsDir, pDirEntry->szName,
+                                              RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE, &hVfsFileSrc);
+                        if (RT_SUCCESS(rc))
+                        {
+                            rc = RTFsIsoMakerAddUnnamedFileWithVfsFile(pOpts->hIsoMaker, hVfsFileSrc, &idxObj);
+                            RTVfsFileRelease(hVfsFileSrc);
+                            if (RT_FAILURE(rc))
+                                rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error adding file '%s' (VFS recursive, handle): %Rrc",
+                                                            pszSrc, rc);
+                        }
+                        else
+                            rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error opening file '%s' (VFS recursive): %Rrc", pszSrc, rc);
+                    }
+                    else
+                    {
+                        /* Add file with source path: */
+                        rc = RTFsIsoMakerAddUnnamedFileWithSrcPath(pOpts->hIsoMaker, pszSrc, &idxObj);
+                        if (RT_FAILURE(rc))
+                            rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error adding file '%s' (VFS recursive, path): %Rrc",
+                                                        pszSrc, rc);
+                    }
                     if (RT_SUCCESS(rc))
                     {
-                        rc = RTFsIsoMakerAddUnnamedFileWithVfsFile(pOpts->hIsoMaker, hVfsFileSrc, &idxObj);
-                        RTVfsFileRelease(hVfsFileSrc);
-                        if (RT_SUCCESS(rc))
-                        {
-                            pOpts->cItemsAdded++;
-                            rc = RTFsIsoMakerObjSetNameAndParent(pOpts->hIsoMaker, idxObj, idxDirObj, fNamespaces,
-                                                                 pDirEntry->szName);
-                            if (RT_FAILURE(rc))
-                                rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error setting parent & name on file '%s' to '%s': %Rrc",
-                                                            pszSrc, pDirEntry->szName, rc);
-                        }
-                        else
-                            rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error adding file '%s' (VFS recursive): %Rrc", pszSrc, rc);
+                        pOpts->cItemsAdded++;
+                        rc = RTFsIsoMakerObjSetNameAndParent(pOpts->hIsoMaker, idxObj, idxDirObj, fNamespaces,
+                                                             pDirEntry->szName);
+                        if (RT_FAILURE(rc))
+                            rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error setting parent & name on file '%s' to '%s': %Rrc",
+                                                        pszSrc, pDirEntry->szName, rc);
                     }
-                    else
-                        rc = rtFsIsoMakerCmdErrorRc(pOpts, rc, "Error opening file '%s' (VFS recursive): %Rrc", pszSrc, rc);
                 }
                 else if (RTFS_IS_DIRECTORY(pDirEntry->Info.Attr.fMode))
@@ -1819 +1835 @@
                                 /* Recurse into the sub-directory. */
                                 rc = rtFsIsoMakerCmdAddVfsDirRecursive(pOpts, hVfsSubDirSrc, idxObj, pszSrc,
-                                                                       cchSrc + 1 + pDirEntry->cbName, fNamespaces, cDepth + 1);
+                                                                       cchSrc + 1 + pDirEntry->cbName, fNamespaces, cDepth + 1,
+                                                                       fFilesWithSrcPath);
                             else
                                 rc = rtFsIsoMakerCmdErrorRc(pOpts, rc,
@@ -1864 +1881 @@
  * @param   pszSrc              The source directory name.
  * @param   pParsed             The parsed names.
+ * @param   fFilesWithSrcPath   Whether to add files using @a pszSrc
+ *                              or to add as VFS handles (open first).  For
+ *                              saving native file descriptors.
  * @param   pidxObj             Where to return the configuration index for the
  *                              added file.  Optional.
  */
 static int rtFsIsoMakerCmdAddVfsDirCommon(PRTFSISOMAKERCMDOPTS pOpts, RTVFSDIR hVfsDirSrc, char *pszSrc,
-                                          PCRTFSISOMKCMDPARSEDNAMES pParsed, PCRTFSOBJINFO pObjInfo)
+                                          PCRTFSISOMKCMDPARSEDNAMES pParsed, bool fFilesWithSrcPath, PCRTFSOBJINFO pObjInfo)
 {
     /*
@@ -1904 +1924 @@
             fNamespaces |= pParsed->aNames[i].fNameSpecifiers & RTFSISOMAKERCMDNAME_MAJOR_MASK;
         rc = rtFsIsoMakerCmdAddVfsDirRecursive(pOpts, hVfsDirSrc, idxObj, pszSrc,
-                                               pParsed->aNames[pParsed->cNamesWithSrc - 1].cchPath, fNamespaces, 0 /*cDepth*/);
+                                               pParsed->aNames[pParsed->cNamesWithSrc - 1].cchPath, fNamespaces, 0 /*cDepth*/,
+                                               fFilesWithSrcPath);
     }
 
@@ -1929 +1950 @@
     if (RT_SUCCESS(rc))
     {
-        rc = rtFsIsoMakerCmdAddVfsDirCommon(pOpts, hVfsDirSrc, pszSrc, pParsed, pObjInfo);
+        rc = rtFsIsoMakerCmdAddVfsDirCommon(pOpts, hVfsDirSrc, pszSrc, pParsed, false /*fFilesWithSrcPath*/, pObjInfo);
         RTVfsDirRelease(hVfsDirSrc);
     }
@@ -1958 +1979 @@
     if (RT_SUCCESS(rc))
     {
-        rc = rtFsIsoMakerCmdAddVfsDirCommon(pOpts, hVfsDirSrc, pszSrc, pParsed, pObjInfo);
+        rc = rtFsIsoMakerCmdAddVfsDirCommon(pOpts, hVfsDirSrc, pszSrc, pParsed,
+                                            RTVfsDirIsStdDir(hVfsDirSrc) /*fFilesWithSrcPath*/, pObjInfo);
         RTVfsDirRelease(hVfsDirSrc);
     }

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -2519 +2519 @@
 
 
+RTDECL(void *) RTVfsDirToPrivate(RTVFSDIR hVfsDir, PCRTVFSDIROPS pDirOps)
+{
+    RTVFSDIRINTERNAL *pThis = hVfsDir;
+    AssertPtrReturn(pThis, NULL);
+    AssertReturn(pThis->uMagic == RTVFSDIR_MAGIC, NULL);
+    if (pThis->pOps != pDirOps)
+        return NULL;
+    return pThis->Base.pvThis;
+}
+
+
 #ifdef DEBUG
 # undef RTVfsDirRetain

trunk/src/VBox/Runtime/common/vfs/vfsstddir.cpp

@@ -753 +753 @@
 
 
+RTDECL(bool) RTVfsDirIsStdDir(RTVFSDIR hVfsDir)
+{
+    return RTVfsDirToPrivate(hVfsDir, &g_rtVfsStdDirOps) != NULL;
+}
+
+
 /**
  * @interface_method_impl{RTVFSCHAINELEMENTREG,pfnValidate}