Changeset 57653 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

Sep 8, 2015 10:19:37 AM (9 years ago)

Author:

vboxsync

Message:

Main/HostPowerLinux: fix a potential crash on exit, e.g. during debugging.

File:

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

trunk/src/VBox/Main/src-server/linux/HostPowerLinux.cpp

@@ -85 +85 @@
 HostPowerServiceLinux::~HostPowerServiceLinux()
 {
+    int rc;
+    RTMSINTERVAL cMillies = 5000;
+
     /* Closing the connection should cause the event loop to exit. */
     LogFunc((": Stopping thread\n"));
@@ -90 +93 @@
         dbus_connection_close(mpConnection);
 
-    RTThreadWait(mThread, 5000, NULL);
+    rc = RTThreadWait(mThread, cMillies, NULL);
+    if (rc != VINF_SUCCESS)
+        LogRelThisFunc(("RTThreadWait() for %u ms failed with %Rrc\n", cMillies, rc));
     mThread = NIL_RTTHREAD;
 }
@@ -99 +104 @@
     NOREF(hThreadSelf);
     HostPowerServiceLinux *pPowerObj = static_cast<HostPowerServiceLinux *>(pInstance);
+    DBusConnection *pConnection = pPowerObj->mpConnection;
 
     Log(("HostPowerServiceLinux: Thread started\n"));
-    while (dbus_connection_read_write(pPowerObj->mpConnection, -1))
+    while (dbus_connection_read_write(pConnection, -1))
     {
         DBusMessage *pMessage = NULL;
@@ -110 +116 @@
             dbus_bool_t fSuspend;
 
-            pMessage = dbus_connection_pop_message(pPowerObj->mpConnection);
+            pMessage = dbus_connection_pop_message(pConnection);
             if (pMessage == NULL)
                 break;
@@ -140 +146 @@
     }
     /* Close the socket or whatever underlying the connection. */
-    dbus_connection_close(pPowerObj->mpConnection);
+    dbus_connection_close(pConnection);
     /* Free in-process resources used for the now-closed connection. */
-    dbus_connection_unref(pPowerObj->mpConnection);
-    pPowerObj->mpConnection = NULL;
+    dbus_connection_unref(pConnection);
     Log(("HostPowerServiceLinux: Exiting thread\n"));
     return VINF_SUCCESS;