Changeset 82552 in vbox for trunk/src/VBox/Main/src-helper-apps

Timestamp:

Dec 11, 2019 2:36:06 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135422

Message:

VBoxExtPackHelperApp: Retry RTDirRename on windows in case of AV software scanning temporary or exiting directories while we install / remove then.

File:

• trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -37 +37 @@
 #include <iprt/string.h>
 #include <iprt/stream.h>
+#include <iprt/thread.h>
 #include <iprt/utf16.h>
 #include <iprt/vfs.h>
@@ -221 +222 @@
 
 /**
+ * Wrapper around RTDirRename that may retry the operation for up to 15 seconds
+ * on windows to deal with AV software.
+ */
+static int CommonDirRenameWrapper(const char *pszSrc, const char *pszDst, uint32_t fFlags)
+{
+#ifdef RT_OS_WINDOWS
+    uint64_t nsNow = RTTimeNanoTS();
+    for (;;)
+    {
+        int rc = RTDirRename(pszSrc, pszDst, fFlags);
+        if (   (   rc == VERR_ACCESS_DENIED
+                || rc == VERR_SHARING_VIOLATION)
+            && RTTimeNanoTS() - nsNow < RT_NS_15SEC)
+            return rc;
+        RTThreadSleep(128);
+    }
+#else
+    return RTDirRename(pszSrc, pszDst, fFlags);
+#endif
+}
+
+/**
  * Common uninstall worker used by both uninstall and install --replace.
  *
@@ -237 +260 @@
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to construct temporary extension pack path: %Rrc", rc);
 
-    rc = RTDirRename(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
+    rc = CommonDirRenameWrapper(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
     if (rc == VERR_ALREADY_EXISTS)
     {
@@ -245 +268 @@
            installation directory.) */
         RemoveExtPackDir(szExtPackUnInstDir, false /*fTemporary*/);
-        rc = RTDirRename(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
+        rc = CommonDirRenameWrapper(pszExtPackDir, szExtPackUnInstDir, RTPATHRENAME_FLAGS_NO_REPLACE);
     }
     if (RT_FAILURE(rc))
@@ -752 +775 @@
     if (rcExit == RTEXITCODE_SUCCESS)
     {
-        rc = RTDirRename(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
+        rc = CommonDirRenameWrapper(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
         if (   RT_FAILURE(rc)
             && fReplace
@@ -760 +783 @@
             rcExit = CommonUninstallWorker(szFinalPath);
             if (rcExit == RTEXITCODE_SUCCESS)
-                rc = RTDirRename(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
+                rc = CommonDirRenameWrapper(szTmpPath, szFinalPath, RTPATHRENAME_FLAGS_NO_REPLACE);
         }
         if (RT_SUCCESS(rc))