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

Timestamp:

Sep 5, 2007 8:34:25 AM (17 years ago)

Author:

vboxsync

Message:

Updates for guest statistics

Location:

trunk/src/VBox/Additions/WINNT

Files:

• VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)
• VBoxService/VBoxGuest.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -428 +428 @@
 }
 
+static NTSTATUS VBoxGuestQueryMemoryBalloon(PVBOXGUESTDEVEXT pDevExt)
+{
+    /* just perform the request */
+    VMMDevGetMemBalloonChangeRequest *req = NULL;
+
+    Log(("VBoxGuestQueryMemoryBalloon\n"));
+
+    int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevGetMemBalloonChangeRequest), VMMDevReq_GetMemBalloonChangeRequest);
+    vmmdevInitRequest(&req->header, VMMDevReq_GetMemBalloonChangeRequest);
+    req->eventAck = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
+
+    if (VBOX_SUCCESS(rc))
+    {
+        rc = VbglGRPerform(&req->header);
+
+        if (VBOX_FAILURE(rc) || VBOX_FAILURE(req->header.rc))
+        {
+            dprintf(("VBoxGuest::VBoxGuestDeviceControl IOCTL_VBOXGUEST_CTL_CHECK_BALLOON: error issuing request to VMMDev!"
+                     "rc = %d, VMMDev rc = %Vrc\n", rc, req->header.rc));
+            Status = STATUS_UNSUCCESSFUL;
+        }
+        else
+        {
+
+        }
+
+        VbglGRFree(&req->header);
+    }
+    else
+    {
+        Status = STATUS_UNSUCCESSFUL;
+    }
+}
+
+
 /**
  * Device I/O Control entry point.
@@ -770 +805 @@
                 pDevExt->ulOldActiveConsoleId    = 0;
             }
+            break;
+        }
+#endif
+
+#ifdef VBOX_WITH_MANAGEMENT
+        case IOCTL_VBOXGUEST_CTL_CHECK_BALLOON:
+        {
+            Status = VBoxGuestQueryMemoryBalloon(pDevExt);
             break;
         }

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxGuest.cpp

@@ -25 +25 @@
 #include <iprt/assert.h>
 #include "helpers.h"
+#include <winternl.h>
 
 typedef struct _VBOXGUESTCONTEXT
 {
     const VBOXSERVICEENV *pEnv;
+    uint32_t              uStatInterval;
+
+    NTSTATUS (WINAPI *pfnNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS SystemInformationClass, PVOID SystemInformation, ULONG SystemInformationLength, PULONG ReturnLength);
 } VBOXGUESTCONTEXT;
 
@@ -37 +41 @@
 int VBoxGuestInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
+    HANDLE gVBoxDriver = pEnv->hDriver;
+    DWORD  cbReturned;
+
     dprintf(("VBoxGuestInit\n"));
 
-    gCtx.pEnv      = pEnv;
+    gCtx.pEnv          = pEnv;
+    gCtx.uStatInterval = 0;     /* default */
+
+    VMMDevGetStatisticsChangeRequest req;
+    vmmdevInitRequest(&req.header, VMMDevReq_GetStatisticsChangeRequest);
+    req.eventAck = 0;
+
+    if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
+    {
+        dprintf(("VBoxGuestThread: new statistics interval %d seconds\n", req.u32StatInterval));
+        gCtx.uStatInterval = req.u32StatInterval * 1000;
+    }
+    else
+        dprintf(("VBoxGuestThread: DeviceIoControl failed with %d\n", GetLastError()));
+
+    HMODULE hMod = LoadLibrary("NTDLL.DLL");
+    if (hMod)
+    {
+        *(uintptr_t *)&gCtx.pfnNtQuerySystemInformation = (uintptr_t)GetProcAddress(hMod, "NtQuerySystemInformation");
+        if (gCtx.pfnNtQuerySystemInformation)
+            dprintf(("gCtx.pfnNtQuerySystemInformation = %x\n", gCtx.pfnNtQuerySystemInformation));
+        else
+            dprintf(("NTDLL.NtQuerySystemInformation not found!!\n"));
+    }
 
     *pfStartThread = true;
@@ -81 +111 @@
         /* wait for a seamless change event */
         VBoxGuestWaitEventInfo waitEvent;
-        waitEvent.u32TimeoutIn = 1000;
-        waitEvent.u32EventMaskIn = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
+        waitEvent.u32TimeoutIn = (pCtx->uStatInterval) ? pCtx->uStatInterval : 1000;
+        waitEvent.u32EventMaskIn = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST | VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
         if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL))
         {
@@ -98 +128 @@
                 DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_CTL_CHECK_BALLOON, NULL, 0, NULL, 0, NULL, NULL);
             }
+            if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST)
+            {
+                VMMDevGetStatisticsChangeRequest req;
+                vmmdevInitRequest(&req.header, VMMDevReq_GetStatisticsChangeRequest);
+                req.eventAck = VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
+
+                if (DeviceIoControl(gVBoxDriver, IOCTL_VBOXGUEST_VMMREQUEST, &req, req.header.size, &req, req.header.size, &cbReturned, NULL))
+                {
+                    dprintf(("VBoxGuestThread: new statistics interval %d seconds\n", req.u32StatInterval));
+                    pCtx->uStatInterval = req.u32StatInterval * 1000;
+                }
+                else
+                    dprintf(("VBoxGuestThread: DeviceIoControl failed with %d\n", GetLastError()));
+
+            }
         } 
         else
@@ -110 +155 @@
             }
         }
+        if (    gCtx.uStatInterval 
+            &&  gCtx.pfnNtQuerySystemInformation)
+        {
+            SYSTEM_INFO systemInfo;
+
+            /* Query and report guest statistics */
+            GetSystemInfo(&systemInfo);
+
+            //gCtx.pfnNtQuerySystemInformation(
+        }
     } 
     while (!fTerminate);
 
     maskInfo.u32OrMask = 0;
-    maskInfo.u32NotMask = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
+    maskInfo.u32NotMask = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST | VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST;
     if (DeviceIoControl (gVBoxDriver, IOCTL_VBOXGUEST_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL))
     {