Changeset 99089 in vbox for trunk

Timestamp:

Mar 21, 2023 3:04:25 PM (23 months ago)

Author:

vboxsync

Message:

Guest Control/FE/Qt: Make sure of IGuestDirectory::list() in the Guest Control file manager, to speed up directory listings. bugref:9783

File:

• trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -528 +528 @@
     if (directory.isOk())
     {
-        CFsObjInfo fsInfo = directory.Read();
+        int const cMaxEntries = _4K; /* Maximum number of entries to read at once per List() call. */
+
+        QVector<CFsObjInfo> vecFsInfo = directory.List(cMaxEntries);
         QMap<QString, UICustomFileSystemItem*> fileObjects;
 
-        while (fsInfo.isOk())
-        {
-            if (fsInfo.GetName() != "." && fsInfo.GetName() != "..")
+        while (directory.isOk())
+        {
+            for (int i = 0; i < vecFsInfo.size(); i++)
             {
-                QVector<QVariant> data;
-                QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/RT_NS_1MS);
-                KFsObjType fsObjectType = fileType(fsInfo);
-                UICustomFileSystemItem *item = new UICustomFileSystemItem(fsInfo.GetName(), parent, fsObjectType);
-                if (!item)
-                    continue;
-                item->setData(static_cast<qulonglong>(fsInfo.GetObjectSize()), UICustomFileSystemModelColumn_Size);
-                item->setData(changeTime, UICustomFileSystemModelColumn_ChangeTime);
-                item->setData(fsInfo.GetUserName(), UICustomFileSystemModelColumn_Owner);
-                item->setData(permissionString(fsInfo), UICustomFileSystemModelColumn_Permissions);
-                item->setPath(UIPathOperations::removeTrailingDelimiters(UIPathOperations::mergePaths(strPath, fsInfo.GetName())));
-                item->setIsOpened(false);
-                item->setIsHidden(isFileObjectHidden(fsInfo));
-                fileObjects.insert(fsInfo.GetName(), item);
-                /* @todo. We will need to wait a fully implemented SymlinkRead function
-                 * to be able to handle sym links properly: */
-                // QString path = UIPathOperations::mergePaths(strPath, fsInfo.GetName());
-                // QVector<KSymlinkReadFlag> aFlags;
-                // printf("%s %s %s\n", qPrintable(fsInfo.GetName()), qPrintable(path),
-                //        qPrintable(m_comGuestSession.SymlinkRead(path, aFlags)));
+                CFsObjInfo const &fsInfo = vecFsInfo[i];
+
+                if (fsInfo.GetName() != "." && fsInfo.GetName() != "..")
+                {
+                    QVector<QVariant> data;
+                    QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/RT_NS_1MS);
+                    KFsObjType fsObjectType = fileType(fsInfo);
+                    UICustomFileSystemItem *item = new UICustomFileSystemItem(fsInfo.GetName(), parent, fsObjectType);
+                    if (!item)
+                        continue;
+                    item->setData(static_cast<qulonglong>(fsInfo.GetObjectSize()), UICustomFileSystemModelColumn_Size);
+                    item->setData(changeTime, UICustomFileSystemModelColumn_ChangeTime);
+                    item->setData(fsInfo.GetUserName(), UICustomFileSystemModelColumn_Owner);
+                    item->setData(permissionString(fsInfo), UICustomFileSystemModelColumn_Permissions);
+                    item->setPath(UIPathOperations::removeTrailingDelimiters(UIPathOperations::mergePaths(strPath, fsInfo.GetName())));
+                    item->setIsOpened(false);
+                    item->setIsHidden(isFileObjectHidden(fsInfo));
+                    fileObjects.insert(fsInfo.GetName(), item);
+                    /* @todo. We will need to wait a fully implemented SymlinkRead function
+                     * to be able to handle sym links properly: */
+                    // QString path = UIPathOperations::mergePaths(strPath, fsInfo.GetName());
+                    // QVector<KSymlinkReadFlag> aFlags;
+                    // printf("%s %s %s\n", qPrintable(fsInfo.GetName()), qPrintable(path),
+                    //        qPrintable(m_comGuestSession.SymlinkRead(path, aFlags)));
+                }
             }
-            fsInfo = directory.Read();
-        }
+
+            vecFsInfo = directory.List(cMaxEntries);
+        }
+
         checkDotDot(fileObjects, parent, isStartDir);
     }
+
     directory.Close();
 }