Changeset 43927 in vbox

Timestamp:

Nov 21, 2012 10:29:18 AM (12 years ago)

Author:

vboxsync

Message:

Forward ported r81841 + r82127 (VBoxHeadless/VBoxService: Enhanced (release flow) logging for user disconnect handling, more flow logging).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (5 diffs)
• Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -262 +262 @@
 
 #if defined(VBOX_WITH_DBUS) && defined(RT_OS_LINUX) /* Not yet for Solaris/FreeBSB. */
-/* 
+/*
  * Simple wrapper to work around compiler-specific va_list madness.
  */
@@ -388 +388 @@
                 char **ppszSessions; int cSessions;
                 if (   (dbus_message_get_type(pMsgSessions) == DBUS_MESSAGE_TYPE_METHOD_CALL)
-                    && vboxService_dbus_message_get_args(pReplySessions, &dbErr, DBUS_TYPE_ARRAY, 
-                                                         DBUS_TYPE_OBJECT_PATH, &ppszSessions, &cSessions, 
+                    && vboxService_dbus_message_get_args(pReplySessions, &dbErr, DBUS_TYPE_ARRAY,
+                                                         DBUS_TYPE_OBJECT_PATH, &ppszSessions, &cSessions,
                                                          DBUS_TYPE_INVALID /* Termination */))
                 {
@@ -429 +429 @@
                                         && ppwEntry->pw_name)
                                     {
-                                        VBoxServiceVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n", 
+                                        VBoxServiceVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n",
                                                            *ppszCurSession, ppwEntry->pw_name, uid);
 
@@ -471 +471 @@
                 {
                     VBoxServiceError("ConsoleKit: unable to retrieve session parameters (msg type=%d): %s",
-                                     dbus_message_get_type(pMsgSessions), 
+                                     dbus_message_get_type(pMsgSessions),
                                      dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available\n");
                 }
@@ -566 +566 @@
 
     if (pszUserList && cUsersInList > 0)
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", "%s", pszUserList);
+        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", "%s", pszUserList);
     else
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", NULL);
-    VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsers", "%u", cUsersInList);
+        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", NULL);
+    if (RT_FAILURE(rc))
+    {
+        VBoxServiceError("VMInfo: Error writing logged on users list, rc=%Rrc\n", rc);
+        cUsersInList = 0; /* Reset user count on error. */
+    }
+
+    rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/LoggedInUsers", "%u", cUsersInList);
+    if (RT_FAILURE(rc))
+    {
+        VBoxServiceError("VMInfo: Error writing logged on users count, rc=%Rrc\n", rc);
+        cUsersInList = 0; /* Reset user count on error. */
+    }
+
     if (g_cVMInfoLoggedInUsers != cUsersInList)
     {
-        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers",
-                                   cUsersInList == 0 ? "true" : "false");
+        rc = VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers",
+                                        cUsersInList == 0 ? "true" : "false");
+        if (RT_FAILURE(rc))
+            VBoxServiceError("VMInfo: Error writing no logged in users beacon, rc=%Rrc\n", rc);
         g_cVMInfoLoggedInUsers = cUsersInList;
     }
-
-    if (RT_SUCCESS(rc) && pszUserList)
+    if (pszUserList)
         RTStrFree(pszUserList);
     return rc;

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -168 +168 @@
                 Assert(gpcev);
 
-                Bstr aKey;
-                gpcev->COMGETTER(Name)(aKey.asOutParam());
-
-                if (aKey == Bstr("/VirtualBox/GuestInfo/OS/NoLoggedInUsers"))
+                Bstr strKey;
+                gpcev->COMGETTER(Name)(strKey.asOutParam());
+
+                Utf8Str utf8Key = strKey;
+                LogRelFlow(("Guest property \"%s\" has been changed\n", utf8Key.c_str()));
+
+                if (utf8Key.equals("/VirtualBox/GuestInfo/OS/NoLoggedInUsers"))
                 {
+                    LogRelFlow(("Guest indicates that there %s logged in users (anymore)\n",
+                                utf8Key.equals("true") ? "are no" : "are"));
+
                     /* Check if this is our machine and the "disconnect on logout feature" is enabled. */
                     BOOL fProcessDisconnectOnGuestLogout = FALSE;
@@ -188 +194 @@
                             if (id == machineId)
                             {
-                                Bstr value1;
+                                Bstr strDiscon;
                                 hrc = machine->GetExtraData(Bstr("VRDP/DisconnectOnGuestLogout").raw(),
-                                                            value1.asOutParam());
-                                if (SUCCEEDED(hrc) && value1 == "1")
+                                                            strDiscon.asOutParam());
+                                if (SUCCEEDED(hrc))
                                 {
-                                    fProcessDisconnectOnGuestLogout = TRUE;
+                                    Utf8Str utf8Discon = strDiscon;
+                                    fProcessDisconnectOnGuestLogout = utf8Discon.equals("1")
+                                                                    ? TRUE : FALSE;
+
+                                    LogRelFlow(("VRDE: ExtraData VRDP/DisconnectOnGuestLogout=%s\n",
+                                                utf8Discon.c_str()));
                                 }
                             }
                         }
                     }
+                    else
+                        LogRel(("VRDE: No console available, skipping disconnect on guest logout check\n"));
+
+                    LogRelFlow(("VRDE: hrc=%Rhrc: Host %s disconnecting clients (current host state known: %s)\n",
+                                hrc, fProcessDisconnectOnGuestLogout ? "will handle" : "does not handle",
+                                mfNoLoggedInUsers ? "No users logged in" : "Users logged in"));
 
                     if (fProcessDisconnectOnGuestLogout)
@@ -226 +243 @@
                             fDropConnection = true;
 
+                        LogRelFlow(("VRDE: szNoLoggedInUsers=%s, mfNoLoggedInUsers=%RTbool, fDropConnection=%RTbool\n",
+                                    utf8Value.c_str(), mfNoLoggedInUsers, fDropConnection));
+
                         if (fDropConnection)
                         {
@@ -235 +255 @@
                                 ULONG cClients = 0;
                                 hrc = info->COMGETTER(NumberOfClients)(&cClients);
+
+                                LogRelFlow(("VRDE: connected clients=%RU32\n", cClients));
                                 if (SUCCEEDED(hrc) && cClients > 0)
                                 {
@@ -249 +271 @@
                         }
                     }
+
+                    LogRelFlow(("VRDE: returned with=%Rhrc\n", hrc));
                 }
                 break;