Changeset 6897 in vbox for trunk

Timestamp:

Feb 11, 2008 1:12:27 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: VBoxClient cleanups and sanity fixes

Location:

trunk/src/VBox/Additions/x11/xclient

Files:

trunk/src/VBox/Additions/x11/xclient/seamless-host.cpp

-              r6783
+              r6897
 /** Stops the service. */
 void VBoxGuestSeamlessHost::stop(void)
+void VBoxGuestSeamlessHost::stop(unsigned cMillies /* = RT_INDEFINITE_WAIT */)
+{
     if (!mRunning)  /* Assertion */
 …
         return;
+    }
     mThread.stop(0, 0);
+    mThread.stop(cMillies, 0);
     VbglR3CtlFilterMask(0, VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST);
     VbglR3SeamlessSetCap(false);

-              r6893
+              r6897
     int start(void);
+    /** Stops the service. */
+    void stop(void);
+    /**
+     * Stops the service.
+     * @param cMillies how long to wait for the thread to exit
+     */
+    void stop(unsigned cMillies = RT_INDEFINITE_WAIT);
     /** Returns the current state of the host - i.e. requesting seamless or not. */
 …
             try
+            {
                 stop();
+                stop(2000);
+            }
             catch(...) {}

r6290	r6897
23	23	#include "seamless-glue.h"
24	24
25		/** Thread function class for VBoxGuestSeamless~~X11~~. */
	25	/** Thread function class for VBoxGuestSeamlessGuest. */
26	26	class VBoxGuestSeamlessGuestThread: public VBoxGuestThreadFunction
27	27	{

-              r6893
+              r6897
 #include "thread.h"
+/** Stop the thread using its stop method and get the exit value.
+ * @returns iprt status code
+ * @param   cMillies        The number of milliseconds to wait. Use RT_INDEFINITE_WAIT for
+ *                              an indefinite wait.  Only relevant if the thread is
+ *                              waitable.
+ * @param   prc             Where to store the return code of the thread. Optional.
+ */
+/** Stop the thread using its stop method and get the exit value. */
 int VBoxGuestThread::stop(unsigned cMillies, int *prc)
+{
 …
         try
+        {
             stop(1000, 0);
+            stop(2000, 0);
+        }
         catch(...) {}

Note: See TracChangeset for help on using the changeset viewer.