Changeset 97626 in vbox

Timestamp:

Nov 21, 2022 1:34:53 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Fixed running out of context IDs when copying huge directory listings. Internally IGuestFile::i_closeFile() wasn't unregistering the file object from the guest session, only the public interface IGuestFile::close() did so. bugref:10286

Location:

trunk/src/VBox/Main

Files:

• include/GuestFileImpl.h (modified) (2 diffs)
• include/GuestSessionImplTasks.h (modified) (1 diff)
• src-client/GuestFileImpl.cpp (modified) (3 diffs)
• src-client/GuestSessionImplTasks.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/GuestFileImpl.h

@@ -93 +93 @@
     /** @}  */
 
-private:
+public:
 
     /** @name Wrapped IGuestFile properties.
@@ -135 +135 @@
     /** @}  */
 
+private:
+
     /** This can safely be used without holding any locks.
      * An AutoCaller suffices to prevent it being destroy while in use and

trunk/src/VBox/Main/include/GuestSessionImplTasks.h

@@ -243 +243 @@
     /** @name File handling primitives.
      * @{ */
+    int fileClose(const ComObjPtr<GuestFile> &file);
     int fileCopyFromGuestInner(const Utf8Str &strSrcFile, ComObjPtr<GuestFile> &srcFile,
                                const Utf8Str &strDstFile, PRTFILE phDstFile,

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -384 +384 @@
 
 /**
- * Closes the file on the guest side.
+ * Closes the file on the guest side and unregisters it.
  *
  * @returns VBox status code.
@@ -424 +424 @@
                                     NULL /* FileStatus */, prcGuest);
     unregisterWaitEvent(pEvent);
+
+    /* Unregister the file object from the guest session. */
+    AssertPtr(mSession);
+    int vrc2 = mSession->i_fileUnregister(this);
+    if (RT_SUCCESS(vrc))
+        vrc = vrc2;
 
     LogFlowFuncLeaveRC(vrc);
@@ -1535 +1541 @@
     int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
     int vrc = i_closeFile(&vrcGuest);
-    /* On failure don't return here, instead do all the cleanup
-     * work first and then return an error. */
-
-    AssertPtr(mSession);
-    int vrc2 = mSession->i_fileUnregister(this);
-    if (RT_SUCCESS(vrc))
-        vrc = vrc2;
-
     if (RT_FAILURE(vrc))
     {

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -494 +494 @@
 
 /**
+ * Closes a formerly opened guest file.
+ *
+ * @returns VBox status code.
+ * @param   file                Guest file to close.
+ *
+ * @note    Set a progress error message on error.
+ */
+int GuestSessionTask::fileClose(const ComObjPtr<GuestFile> &file)
+{
+    int vrcGuest;
+    int vrc = file->i_closeFile(&vrcGuest);
+    if (RT_FAILURE(vrc))
+    {
+        Utf8Str strFilename;
+        HRESULT const hrc = file->getFilename(strFilename);
+        AssertComRCReturn(hrc, VERR_OBJECT_DESTROYED);
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR, Utf8StrFmt(tr("Error closing guest file \"%s\": %Rrc"),
+                                                          strFilename.c_str(), vrc == VERR_GSTCTL_GUEST_ERROR ? vrcGuest : vrc));
+        if (RT_SUCCESS(vrc))
+            vrc = vrc == VERR_GSTCTL_GUEST_ERROR ? vrcGuest : vrc;
+    }
+
+    return vrc;
+}
+
+/**
  * Copies a file from the guest to the host.
  *
@@ -613 +639 @@
     if (fSkip)
     {
-        int vrc2 = srcFile->i_closeFile(&vrcGuest);
-        AssertRC(vrc2);
+        int vrc2 = fileClose(srcFile);
+        if (RT_SUCCESS(vrc))
+            vrc = vrc2;
+
         return vrc;
     }
@@ -674 +702 @@
     }
 
-    int vrc2 = srcFile->i_closeFile(&vrcGuest);
-    AssertRC(vrc2);
+    int vrc2 = fileClose(srcFile);
+    if (RT_SUCCESS(vrc))
+        vrc = vrc2;
 
     LogFlowFuncLeaveRC(vrc);
@@ -914 +943 @@
     if (fSkip)
     {
-        int vrc2 = dstFile->i_closeFile(&vrcGuest);
-        AssertRC(vrc2);
+        int vrc2 = fileClose(dstFile);
+        if (RT_SUCCESS(vrc))
+            vrc = vrc2;
+
         return vrc;
     }
@@ -942 +973 @@
     }
 
-    int vrc2 = dstFile->i_closeFile(&vrcGuest);
-    AssertRC(vrc2);
+    int vrc2 = fileClose(dstFile);
+    if (RT_SUCCESS(vrc))
+        vrc = vrc2;
 
     LogFlowFuncLeaveRC(vrc);
@@ -2564 +2596 @@
                 vrc = fileCopyToGuestInner(strFileSrc, hVfsFile, strFileDst, dstFile, FileCopyFlag_None, 0 /*offCopy*/, cbSrcSize);
 
-                int vrc2 = dstFile->i_closeFile(&vrcGuest);
-                AssertRC(vrc2);
+                int vrc2 = fileClose(dstFile);
+                if (RT_SUCCESS(vrc))
+                    vrc = vrc2;
             }
         }