Changeset 56958 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 16, 2015 5:29:44 PM (9 years ago)

Author:

vboxsync

Message:

ClientWatcher.cpp: Deal with possible race between watcher getting the session PID and the session/who-ever reporting the PID.

File:

• trunk/src/VBox/Main/src-server/ClientWatcher.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/ClientWatcher.cpp

@@ -186 +186 @@
             break;
 
+        bool fPidRace = false;
         do
         {
@@ -194 +195 @@
                                                 handles,
                                                 FALSE,
-                                                INFINITE);
+                                                !fPidRace ? INFINITE : 500);
 
             /* Restore the caller before using VirtualBox. If it fails, this
@@ -202 +203 @@
                 break;
 
-            bool update = false;
+            bool update = fPidRace;
 
             if (rc == WAIT_OBJECT_0)
@@ -275 +276 @@
 
                 /* obtain a new set of spawned machines */
+                fPidRace = false;
                 cntSpawned = 0;
                 spawnedMachines.clear();
@@ -292 +294 @@
                         if (SUCCEEDED(hrc))
                         {
-                            HANDLE ph = OpenProcess(SYNCHRONIZE, FALSE, pid);
-                            AssertMsg(ph != NULL, ("OpenProcess (pid=%d) failed with %d\n",
-                                                   pid, GetLastError()));
-                            if (ph != NULL)
+                            if (pid != NIL_RTPROCESS)
                             {
-                                spawnedMachines.push_back(*it);
-                                handles[1 + cnt + cntSpawned] = ph;
-                                ++cntSpawned;
+                                HANDLE hProc = OpenProcess(SYNCHRONIZE, FALSE, pid);
+                                AssertMsg(hProc != NULL, ("OpenProcess (pid=%d) failed with %d\n", pid, GetLastError()));
+                                if (hProc != NULL)
+                                {
+                                    spawnedMachines.push_back(*it);
+                                    handles[1 + cnt + cntSpawned] = hProc;
+                                    ++cntSpawned;
+                                }
                             }
+                            else
+                                fPidRace = true;
                         }
                     }