Changeset 26299 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 5, 2010 3:51:43 PM (15 years ago)

Author:

vboxsync

Message:

Updates

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp (modified) (10 diffs)

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

@@ -53 +53 @@
 /** The semaphore we're blocking on. */
 static RTSEMEVENTMULTI  g_VMStatEvent = NIL_RTSEMEVENTMULTI;
-/** The vmstats interval (millseconds). */
-uint32_t                g_VMStatsInterval = 0;
 
 
@@ -67 +65 @@
 static DECLCALLBACK(int) VBoxServiceVMStatsOption(const char **ppszShort, int argc, char **argv, int *pi)
 {
-    int rc = -1;
-    if (ppszShort)
-        /* no short options */;
-    else if (!strcmp(argv[*pi], "--vmstats-interval"))
-        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
-                                  &g_VMStatsInterval, 1000, UINT32_MAX - 1);
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -97 +89 @@
     if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_VMMREQUEST(req.header.size), &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
     {
-        Log(("VBoxStatsInit: new statistics interval %d seconds\n", req.u32StatInterval));
+        VBoxServiceVerbose(3, "VBoxStatsInit: new statistics interval %d seconds\n", req.u32StatInterval);
         gCtx.uStatInterval = req.u32StatInterval * 1000;
     }
     else
-        Log(("VBoxStatsInit: DeviceIoControl failed with %d\n", GetLastError()));
+        VBoxServiceVerbose(3, ("VBoxStatsInit: DeviceIoControl failed with %d\n", GetLastError());
 
 #ifdef RT_OS_WINDOWS
@@ -149 +141 @@
 static void VBoxServiceVMStatsReport(VBOXSTATSCONTEXT *pCtx)
 {
+#ifdef RT_OS_WINDOWS
     SYSTEM_INFO systemInfo;
     PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION pProcInfo;
@@ -254 +247 @@
 
     free(pProcInfo);
+#else
+    /* todo: implement for other platforms. */
+    return;
+#endif
 }
 
@@ -262 +259 @@
     HANDLE gVBoxDriver = pCtx->pEnv->hDriver;
     bool fTerminate = false;
-    VBoxGuestFilterMaskInfo maskInfo;
-    DWORD cbReturned;
 
     int rc = VINF_SUCCESS;
@@ -273 +268 @@
     RTThreadUserSignal(RTThreadSelf());
 
-    maskInfo.u32OrMask = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
-    maskInfo.u32NotMask = 0;
-    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
-    {
-        Log(("VBoxStatsThread: DeviceIOControl(CtlMask - or) succeeded\n"));
-    }
-    else
-    {
-        Log(("VBoxStatsThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n"));
+    rc = VbglR3CtlFilterMask(VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST, 0);
+    if (RT_FAILED(rc))
+    {
+        VBoxServiceVerbose(3, ("VBoxStatsThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n");
         return 0;
     }
@@ -290 +280 @@
     for (;;)
     {
-        /* Report statistics to the host */
-        if (gCtx.pfnNtQuerySystemInformation)
-        {
-            VBoxServiceVMStatsReport();
-        }
+        uint32_t fEvents = 0;
+
+        rc = VbglR3WaitEvent(VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST, 1000, &fEvents);
+        if (    RT_SUCCESS(rc)
+            &&  (fEvents & VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST))
+        {
+        }
+
+        VBoxServiceVMStatsReport();
 
         /*
@@ -315 +309 @@
     }
 
-    maskInfo.u32OrMask = 0;
-    maskInfo.u32NotMask = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
-    if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
-    {
-        Log(("VBoxStatsThread: DeviceIOControl(CtlMask - not) succeeded\n"));
-    }
-    else
-    {
-        Log(("VBoxStatsThread: DeviceIOControl(CtlMask) failed\n"));
-    }
+    rc = VbglR3CtlFilterMask(0, VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST);
+    if (RT_FAILED(rc))
+    {
+        VBoxServiceVerbose(3, ("VBoxStatsThread: DeviceIOControl(CtlMask) failed, SeamlessChangeThread exited\n");
+        return 0;
+    }
+
 
     RTSemEventMultiDestroy(g_VMStatsEvent);
@@ -359 +350 @@
     "Virtual Machine Statistics",
     /* pszUsage. */
-    "[--vmstats-interval <ms>]"
-    ,
+    NULL,
     /* pszOptions. */
-    "    --vmstats-interval   Specifies the interval at which to retrieve the\n"
-    "                        VM statistcs. The default is 10000 ms.\n"
-    ,
+    NULL,
     /* methods */
     VBoxServiceVMStatsPreInit,