Changeset 93333 in vbox for trunk

Timestamp:

Jan 18, 2022 10:35:21 PM (3 years ago)

Author:

vboxsync

Message:

Installer/win/InstallHelper: Added a Sleep(1) to procWait as it would just spin up CPU cycles otherwise. We don't offer a timed process wait interface because of unix, but might be an idea to add it on windows so as to not encourage more this insanity...

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (8 diffs)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -159 +159 @@
         int rc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, pProcSts);
         if (rc == VERR_PROCESS_RUNNING)
-            continue;
+            Sleep(1); /* Don't spin uncontrolled. duh. */
         else if (RT_FAILURE(rc))
             return rc;
-
-        if (   pProcSts->iStatus   != 0
-            || pProcSts->enmReason != RTPROCEXITREASON_NORMAL)
-        {
-            rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
-        }
-
-        return VINF_SUCCESS;
+        else
+        {
+            if (   pProcSts->iStatus   != 0
+                || pProcSts->enmReason != RTPROCEXITREASON_NORMAL)
+            {
+                /** @todo r=bird: This isn't returned, so what's the point here?  */
+                rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+            }
+            return VINF_SUCCESS;
+        }
     }
 
@@ -180 +182 @@
  * @returns VBox status code.
  * @param   hModule             Windows installer module handle.
- * @param   pcsExe              Absolute path of executable to run.
- * @param   papcszArgs          Pointer to command line arguments to use for calling the executable.
- * @param   cArgs               Number of command line arguments in \a papcszArgs.
+ * @param   pszImage            Absolute path of executable to run.
+ * @param   papszArgs           Pointer to command line arguments to use for calling the executable.
+ * @param   cArgs               Number of command line arguments in \a papszArgs.
  */
-static int procRun(MSIHANDLE hModule, const char *pcszImage, const char **papcszArgs, size_t cArgs)
+static int procRun(MSIHANDLE hModule, const char *pszImage, const char * const *papszArgs, size_t cArgs)
 {
     RT_NOREF(cArgs);
@@ -191 +193 @@
     RT_ZERO(Process);
 
-    uint32_t fProcess  = 0;
+    uint32_t fProcess = 0;
 #ifndef DEBUG
-             fProcess |= RTPROC_FLAGS_HIDDEN;
+    fProcess |= RTPROC_FLAGS_HIDDEN;
 #endif
 
-    int rc = RTProcCreate(pcszImage, papcszArgs, RTENV_DEFAULT, fProcess, &Process);
+    int rc = RTProcCreate(pszImage, papszArgs, RTENV_DEFAULT, fProcess, &Process);
     if (RT_SUCCESS(rc))
     {
@@ -205 +207 @@
 
         if (RT_FAILURE(rc))
-            logStringF(hModule, "procRun: Waiting for process \"%s\" failed with %Rrc (process status: %d, reason: %d)\n",
-                       pcszImage, rc, ProcSts.iStatus, ProcSts.enmReason);
+            logStringF(hModule, "procRun: Waiting for process \"%s\" failed with %Rrc (process status: %d (%#x), reason: %d)\n",
+                       pszImage, rc, ProcSts.iStatus, ProcSts.iStatus, ProcSts.enmReason);
+        else if (   ProcSts.iStatus   != 0
+                 || ProcSts.enmReason != RTPROCEXITREASON_NORMAL)
+            logStringF(hModule, "procRun: Process \"%s\" terminated with iStatus=%d (%#x) and enmReason=%d\n",
+                       pszImage, ProcSts.iStatus, ProcSts.iStatus, ProcSts.enmReason);
     }
     else
-        logStringF(hModule, "procRun: Creating process for \"%s\" failed with %Rrc\n", pcszImage, rc);
+        logStringF(hModule, "procRun: Creating process for \"%s\" failed with %Rrc\n", pszImage, rc);
 
     return rc;
@@ -288 +294 @@
 
     if (RT_FAILURE(rc))
-    {
         RTStrFree(pszPythonPath);
-    }
     else
         *ppszPath = pszPythonPath;
@@ -346 +350 @@
     logStringF(hModule, "checkPythonDependencies: Checking for win32api extensions ...");
 
-    const char *papszArgs[4] = { pcszPythonExe, "-c", "import win32api", NULL};
+    const char *papszArgs[] = { pcszPythonExe, "-c", "import win32api", NULL};
 
     int rc = procRun(hModule, pcszPythonExe, papszArgs, RT_ELEMENTS(papszArgs));
     if (RT_SUCCESS(rc))
-    {
         logStringF(hModule, "checkPythonDependencies: win32api found\n");
-    }
     else
         logStringF(hModule, "checkPythonDependencies: Importing win32api failed with %Rrc\n", rc);
@@ -473 +475 @@
                 logStringF(hModule, "InstallPythonAPI: Invoking vboxapisetup.py in \"%s\" ...\n", pszVBoxSDKPath);
 
-                const char *papszArgs[4] = { pszPythonExe, "vboxapisetup.py", "install", NULL};
+                const char *papszArgs[] = { pszPythonExe, "vboxapisetup.py", "install", NULL};
 
                 rc = procRun(hModule, pszPythonExe, papszArgs, RT_ELEMENTS(papszArgs));
                 if (RT_SUCCESS(rc))
                     logStringF(hModule, "InstallPythonAPI: Installation of vboxapisetup.py successful\n");
-
-                if (RT_FAILURE(rc))
+                else
                     logStringF(hModule, "InstallPythonAPI: Calling vboxapisetup.py failed with %Rrc\n", rc);
             }
@@ -500 +501 @@
         logStringF(hModule, "InstallPythonAPI: Validating VBox API ...\n");
 
-        const char *papszArgs[4] = { pszPythonExe, "-c", "from vboxapi import VirtualBoxManager", NULL};
+        const char *papszArgs[] = { pszPythonExe, "-c", "from vboxapi import VirtualBoxManager", NULL};
 
         rc = procRun(hModule, pszPythonExe, papszArgs, RT_ELEMENTS(papszArgs));
         if (RT_SUCCESS(rc))
             logStringF(hModule, "InstallPythonAPI: VBox API looks good.\n");
-
-        if (RT_FAILURE(rc))
+        else
             logStringF(hModule, "InstallPythonAPI: Validating VBox API failed with %Rrc\n", rc);
     }