Changeset 49938 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Dec 16, 2013 5:13:59 PM (11 years ago)

Author:

vboxsync

Message:

Main/src-server/win/HostPowerWin.cpp: fix long standing bug which caused VBoxSVC to hang around for 5 seconds as the thread termination notification wasn't posted properly
Main/src-server/win/svcmain.cpp: reduced "just in case" sleep, shouldn't be necessary at all, when threads using COM are present the server shouldn't ever get to this place
Runtime/common/log/log.cpp: if there are sharing problems with the log file to be opened, wait for up to 10 seconds, maybe the previous user goes away (helps with VBoxSVC release log which can cause trouble, when the previous process is not quite terminated and some API client triggers the launch of a new one), effectively Windows only

Location:

trunk/src/VBox/Main/src-server/win

Files:

• HostPowerWin.cpp (modified) (2 diffs)
• svcmain.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/win/HostPowerWin.cpp

@@ -54 +54 @@
         /* Is this allowed from another thread? */
         SetWindowLongPtr(mHwnd, 0, 0);
-        /* Send the quit message and wait for it be processed. */
-        SendMessage(mHwnd, WM_QUIT, 0, 0);
+        /* Poke the thread out of the event loop and wait for it to clean up. */
+        PostMessage(mHwnd, WM_QUIT, 0, 0);
         RTThreadWait(mThread, 5000, NULL);
         mThread = NIL_RTTHREAD;
@@ -114 +114 @@
 
             MSG msg;
-            while (GetMessage(&msg, NULL, 0, 0))
+            BOOL fRet;
+            while ((fRet = GetMessage(&msg, NULL, 0, 0)) != 0)
             {
-                TranslateMessage(&msg);
-                DispatchMessage(&msg);
+                if (fRet != -1)
+                {
+                    TranslateMessage(&msg);
+                    DispatchMessage(&msg);
+                }
+                else
+                {
+                    // handle the error and possibly exit
+                    break;
+                }
             }
         }

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2004-2012 Oracle Corporation
+ * Copyright (C) 2004-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -57 +57 @@
 
 const DWORD dwTimeOut = 5000; /* time for EXE to be idle before shutting down */
-const DWORD dwPause = 1000; /* time to wait for threads to finish up */
+const DWORD dwPause = 100; /* time to wait for threads to finish up */
 
 /* Passed to CreateThread to monitor the shutdown event */