Changeset 47973 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Aug 21, 2013 2:25:52 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88291

Message:

VBoxService/VBoxTray: User idle detection: Lower last input time granularity from milliseconds to seconds in order to also support periods > 49 days in a row.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceVMInfo-win.cpp (modified) (3 diffs)
• VBoxServiceVMInfo.cpp (modified) (4 diffs)
• VBoxServiceVMInfo.h (modified) (1 diff)

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

@@ -835 +835 @@
                                            NULL /* Exact read */);
             if (   RT_SUCCESS(rc)
-                /* If uLastInputMs is set to UINT32_MAX VBoxTray was not able to retrieve the
+                /* If uLastInput is set to UINT32_MAX VBoxTray was not able to retrieve the
                  * user's last input time. This might happen when running on Windows NT4 or older. */
-                && ipcRes.uLastInputMs != UINT32_MAX)
+                && ipcRes.uLastInput != UINT32_MAX)
             {
-                VBoxGuestUserState userState = ipcRes.uLastInputMs < g_uVMInfoUserIdleThreshold
+                VBoxGuestUserState userState = (ipcRes.uLastInput * 1000) < g_uVMInfoUserIdleThresholdMS
                                              ? VBoxGuestUserState_InUse
                                              : VBoxGuestUserState_Idle;
@@ -854 +854 @@
                 if (rc == VINF_SUCCESS)
                 {
-                    VBoxServiceVerbose(4, "User \"%s\" (domain \"%s\") is idle for %RU32ms\n",
-                                       pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInputMs);
+                    VBoxServiceVerbose(4, "User \"%s\" (domain \"%s\") is idle for %RU32s\n",
+                                       pszUser, pszDomain ? pszDomain : "<None>", ipcRes.uLastInput);
 
 #if 0 /* Do we want to write the idle time as well? */
@@ -873 +873 @@
             }
 #ifdef DEBUG
-            else if (ipcRes.uLastInputMs == UINT32_MAX)
+            else if (ipcRes.uLastInput == UINT32_MAX)
                 VBoxServiceVerbose(4, "Last input for user \"%s\" is not available, skipping\n",
                                    pszUser, rc);

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

@@ -111 +111 @@
 /** The current LA client info. */
 static VBOXSERVICELACLIENTINFO  g_LAClientInfo;
-/** User idle threshold. This specifies the minimum time a user is considered
- *  being idle and then will be reported to the host. Default is 5s. */
-uint32_t                        g_uVMInfoUserIdleThreshold = 5 * 1000;
+/** User idle threshold (in ms). This specifies the minimum time a user is considered
+ *  as being idle and then will be reported to the host. Default is 5s. */
+uint32_t                        g_uVMInfoUserIdleThresholdMS = 5 * 1000;
 
 
@@ -172 +172 @@
     else if (!strcmp(argv[*pi], "--vminfo-user-idle-threshold"))
         rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_uVMInfoUserIdleThreshold, 1, UINT32_MAX - 1);
+                                  &g_uVMInfoUserIdleThresholdMS, 1, UINT32_MAX - 1);
     return rc;
 }
@@ -256 +256 @@
         {
             AssertPtr(pszValue);
-            g_uVMInfoUserIdleThreshold = RT_CLAMP(RTStrToUInt32(pszValue), 1000, UINT32_MAX - 1);
+            g_uVMInfoUserIdleThresholdMS = RT_CLAMP(RTStrToUInt32(pszValue), 1000, UINT32_MAX - 1);
             RTStrFree(pszValue);
         }
@@ -1487 +1487 @@
     "    --vminfo-user-idle-threshold <ms>\n"
     "                            Specifies the user idle threshold (in ms) for\n"
-    "                            considering a guest user being as idle. The default\n"
+    "                            considering a guest user as being idle. The default\n"
     "                            is 5000 (5 seconds).\n"
     ,

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

@@ -26 +26 @@
 //RT_C_DECLS_END
 
-extern uint32_t g_uVMInfoUserIdleThreshold;
+extern uint32_t g_uVMInfoUserIdleThresholdMS;
 
 #endif /* ___VBoxServiceVMInfo_h */