Changeset 47977 in vbox

Timestamp:

Aug 21, 2013 4:37:27 PM (11 years ago)

Author:

vboxsync

Message:

VBoxService/VBoxTray: User idle detection: Reset usage status to idle when VBoxTray exits, cleanup.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxIPC.cpp (modified) (7 diffs)
• common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

@@ -52 +52 @@
 } VBOXIPCCONTEXT, *PVBOXIPCCONTEXT;
 static VBOXIPCCONTEXT gCtx = {0};
+
+/** Function pointer for GetLastInputInfo(). */
+typedef BOOL (WINAPI *PFNGETLASTINPUTINFO)(PLASTINPUTINFO);
 
 /**
@@ -69 +72 @@
     /** The thread handle. */
     RTTHREAD                            hThread;
-    /** Pointer to GetLastInputInfo() function. */
-    BOOL (WINAPI * pfnGetLastInputInfo)(PLASTINPUTINFO);
 
 } VBOXIPCSESSION, *PVBOXIPCSESSION;
+
+/** Static pointer to GetLastInputInfo() function. */
+static PFNGETLASTINPUTINFO s_pfnGetLastInputInfo = NULL;
 
 int vboxIPCSessionDestroyLocked(PVBOXIPCSESSION pSession);
@@ -118 +122 @@
     bool fLastInputAvailable = false;
     VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
-    if (pSession->pfnGetLastInputInfo)
+    if (s_pfnGetLastInputInfo)
     {
         /* Note: This only works up to 49.7 days (= 2^32, 32-bit counter)
@@ -124 +128 @@
         LASTINPUTINFO lastInput;
         lastInput.cbSize = sizeof(LASTINPUTINFO);
-        BOOL fRc = pSession->pfnGetLastInputInfo(&lastInput);
+        BOOL fRc = s_pfnGetLastInputInfo(&lastInput);
         if (fRc)
         {
-            VBOXTRAYIPCRES_USERLASTINPUT ipcRes;
             ipcRes.uLastInput = (GetTickCount() - lastInput.dwTime) / 1000;
             fLastInputAvailable = true;
@@ -196 +199 @@
                         *ppInstance = &gCtx;
                         *pfStartThread = true;
+
+                        /* GetLastInputInfo only is available starting at Windows 2000. */
+                        s_pfnGetLastInputInfo = (PFNGETLASTINPUTINFO)
+                            RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
 
                         LogRelFunc(("Local IPC server now running at \"%s\"\n",
@@ -438 +445 @@
             rc = VERR_NO_MEMORY;
 
-        if (RT_SUCCESS(rc))
-        {
-            *(void **)&pSession->pfnGetLastInputInfo =
-                RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
-            /* GetLastInputInfo only is available starting at Windows 2000. */
-        }
-
         int rc2 = RTCritSectLeave(&pCtx->CritSect);
         AssertRC(rc2);
@@ -457 +457 @@
 
     pSession->hThread = NIL_RTTHREAD;
-    pSession->pfnGetLastInputInfo = NULL;
 
     RTLOCALIPCSESSION hSession;

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

@@ -814 +814 @@
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
     AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
+    /* pszDomain is optional. */
 
     int rc = VINF_SUCCESS;
@@ -821 +822 @@
                     VBOXTRAY_IPC_PIPE_PREFIX, pszUser))
     {
+        bool fReportToHost = false;
+        VBoxGuestUserState userState = VBoxGuestUserState_Unknown;
+
         RTLOCALIPCSESSION hSession;
         rc = RTLocalIpcSessionConnect(&hSession, szPipeName, 0 /* Flags */);
@@ -839 +843 @@
                 && ipcRes.uLastInput != UINT32_MAX)
             {
-                VBoxGuestUserState userState = (ipcRes.uLastInput * 1000) < g_uVMInfoUserIdleThresholdMS
-                                             ? VBoxGuestUserState_InUse
-                                             : VBoxGuestUserState_Idle;
+                userState = (ipcRes.uLastInput * 1000) < g_uVMInfoUserIdleThresholdMS
+                          ? VBoxGuestUserState_InUse
+                          : VBoxGuestUserState_Idle;
 
                 rc = vboxServiceUserUpdateF(pCache, pszUser, pszDomain, "UsageState",
@@ -852 +856 @@
                  *       new.
                  */
-                if (rc == VINF_SUCCESS)
-                {
-                    VBoxServiceVerbose(4, "User \"%s\" (domain \"%s\") is idle for %RU32s\n",
-                                       pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput);
+                fReportToHost = rc == VINF_SUCCESS;
+                VBoxServiceVerbose(4, "User \"%s\" (domain \"%s\") is idle for %RU32, fReportToHost=%RTbool\n",
+                                   pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput, fReportToHost);
 
 #if 0 /* Do we want to write the idle time as well? */
@@ -868 +871 @@
                     if (RT_SUCCESS(rc))
 #endif
-                        rc = VbglR3GuestUserReportState(pszUser, pszDomain, userState,
-                                                        NULL /* No details */, 0);
-                }
             }
 #ifdef DEBUG
             else if (ipcRes.uLastInput == UINT32_MAX)
-                VBoxServiceVerbose(4, "Last input for user \"%s\" is not available, skipping\n",
+                VBoxServiceVerbose(4, "Last input for user \"%s\" is not supported, skipping\n",
                                    pszUser, rc);
 
@@ -889 +889 @@
             {
                 case VERR_FILE_NOT_FOUND:
+                {
                     /* No VBoxTray (or too old version which does not support IPC) running
                        for the given user. Not much we can do then. */
-                    VBoxServiceVerbose(4, "User \"%s\" not logged in, no last input available\n",
+                    VBoxServiceVerbose(4, "VBoxTray for user \"%s\" not running (anymore), no last input available\n",
                                        pszUser);
+
+                    /* Overwrite rc from above. */
+                    rc = vboxServiceUserUpdateF(pCache, pszUser, pszDomain,
+                                                "UsageState", "Idle");
+
+                    fReportToHost = rc == VINF_SUCCESS;
+                    if (fReportToHost)
+                        userState = VBoxGuestUserState_Idle;
                     break;
+                }
 
                 default:
-                    VBoxServiceVerbose(4, "Error querying last input for user \"%s\", rc=%Rrc\n",
-                                       pszUser, rc);
+                    VBoxServiceError("Error querying last input for user \"%s\", rc=%Rrc\n",
+                                     pszUser, rc);
                     break;
             }
-
-            rc = VINF_SUCCESS;
+        }
+
+        if (fReportToHost)
+        {
+            Assert(userState != VBoxGuestUserState_Unknown);
+            int rc2 = VbglR3GuestUserReportState(pszUser, pszDomain, userState,
+                                                 NULL /* No details */, 0);
+            if (RT_FAILURE(rc2))
+                VBoxServiceError("Error reporting usage state %ld for user \"%s\" to host, rc=%Rrc\n",
+                                 userState, pszUser, rc2);
+
+            if (RT_SUCCESS(rc))
+                rc = rc2;
         }
     }