Changeset 4524 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Updates for guest statistics

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (4 diffs)
• include/VBox/pdmifs.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxService/VBoxGuest.cpp (modified) (5 diffs)
• src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (5 diffs)
• src/VBox/Devices/VMMDev/VMMDevState.h (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -146 +146 @@
     VMMDevReq_ReportGuestStats           = 110,
     VMMDevReq_GetMemBalloonChangeRequest = 111,
+    VMMDevReq_GetStatisticsChangeRequest = 112,
     VMMDevReq_LogString                  = 200,
     VMMDevReq_SizeHack                   = 0x7fffffff
@@ -403 +404 @@
     uint32_t            eventAck;
 } VMMDevGetMemBalloonChangeRequest;
+
+/** guest statistics interval change request structure */
+typedef struct
+{
+    /** header */
+    VMMDevRequestHeader header;
+    uint32_t            u32StatInterval; /* interval in seconds */
+    uint32_t            eventAck;
+} VMMDevGetStatisticsChangeRequest;
  
 /** display change request structure */
@@ -969 +979 @@
 
 /** Host mouse capabilities has been changed. */
-#define VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED     BIT(0)
+#define VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED             BIT(0)
 /** HGCM event. */
-#define VMMDEV_EVENT_HGCM                           BIT(1)
+#define VMMDEV_EVENT_HGCM                                   BIT(1)
 /** A display change request has been issued. */
-#define VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST         BIT(2)
+#define VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST                 BIT(2)
 /** Credentials are available for judgement. */
-#define VMMDEV_EVENT_JUDGE_CREDENTIALS              BIT(3)
+#define VMMDEV_EVENT_JUDGE_CREDENTIALS                      BIT(3)
 /** The guest has been restored. */
-#define VMMDEV_EVENT_RESTORED                       BIT(4)
+#define VMMDEV_EVENT_RESTORED                               BIT(4)
 /** Seamless mode state changed */
-#define VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST   BIT(5)
+#define VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST           BIT(5)
 /** Memory balloon size changed */
-#define VMMDEV_EVENT_BALLOON_CHANGE_REQUEST         BIT(6)
+#define VMMDEV_EVENT_BALLOON_CHANGE_REQUEST                 BIT(6)
+/** Statistics interval changed */
+#define VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST     BIT(7)
 /** VRDP status changed. */
 #define VMMDEV_EVENT_VRDP                           BIT(7)
@@ -1305 +1317 @@
         case VMMDevReq_GetMemBalloonChangeRequest:
             return sizeof(VMMDevGetMemBalloonChangeRequest);
+        case VMMDevReq_GetStatisticsChangeRequest:
+            return sizeof(VMMDevGetStatisticsChangeRequest);
         case VMMDevReq_LogString:
             return sizeof(VMMDevReqLogString);

trunk/include/VBox/pdmifs.h

@@ -1413 +1413 @@
     DECLR3CALLBACKMEMBER(int, pfnSetMemoryBalloon,(PPDMIVMMDEVPORT pInterface, uint32_t ulBalloonSize));
 
+    /**
+     * Issue a statistcs interval change request.
+     *
+     * Note that there can only one request in the queue and that in case the guest does
+     * not process it, issuing another request will overwrite the previous.
+     *
+     * @returns VBox status code
+     * @param   ulStatInterval  Statistics query interval in seconds (0=disable)
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetStatisticsInterval,(PPDMIVMMDEVPORT pInterface, uint32_t ulStatInterval));
+
 } PDMIVMMDEVPORT;
 

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))
     {

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1184 +1184 @@
             if (requestHeader->size != sizeof(VMMDevGetMemBalloonChangeRequest))
             {
+                AssertFailed();
                 requestHeader->rc = VERR_INVALID_PARAMETER;
             }
@@ -1197 +1198 @@
                     /* Remember which mode the client has queried. */
                     pData->u32LastMemoryBalloonSize = pData->u32MemoryBalloonSize;
+                }
+
+                requestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
+
+        case VMMDevReq_GetStatisticsChangeRequest:
+        {
+            Log(("VMMDevReq_GetStatisticsChangeRequest\n"));
+            if (requestHeader->size != sizeof(VMMDevGetStatisticsChangeRequest))
+            {
+                AssertFailed();
+                requestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevGetStatisticsChangeRequest *statIntervalChangeRequest = (VMMDevGetStatisticsChangeRequest*)requestHeader;
+                /* just pass on the information */
+                Log(("VMMDev: returning statistics interval %d seconds\n", pData->u32StatIntervalSize));
+                statIntervalChangeRequest->u32StatInterval = pData->u32StatIntervalSize;
+
+                if (statIntervalChangeRequest->eventAck == VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST)
+                {
+                    /* Remember which mode the client has queried. */
+                    pData->u32LastStatIntervalSize= pData->u32StatIntervalSize;
                 }
 
@@ -1696 +1723 @@
     return VINF_SUCCESS;
 }
+
+static DECLCALLBACK(int) vmmdevSetStatisticsInterval(PPDMIVMMDEVPORT pInterface, uint32_t ulStatInterval)
+{
+    VMMDevState *pData = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+
+    /* Verify that the new resolution is different and that guest does not yet know about it. */
+    bool fSame = (pData->u32LastStatIntervalSize == ulStatInterval);
+
+    Log(("vmmdevSetStatisticsInterval: old=%d. new=%d\n", pData->u32LastStatIntervalSize, ulStatInterval));
+
+    if (!fSame)
+    {
+        /* we could validate the information here but hey, the guest can do that as well! */
+        pData->u32StatIntervalSize = ulStatInterval;
+
+        /* IRQ so the guest knows what's going on */
+        VMMDevNotifyGuest (pData, VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST);
+    }
+
+    return VINF_SUCCESS;
+}
+
 
 static DECLCALLBACK(int) vmmdevSetCredentials(PPDMIVMMDEVPORT pInterface, const char *pszUsername,
@@ -1985 +2034 @@
     pData->Port.pfnRequestSeamlessChange  = vmmdevRequestSeamlessChange;
     pData->Port.pfnSetMemoryBalloon       = vmmdevSetMemoryBalloon;
+    pData->Port.pfnSetStatisticsInterval  = vmmdevSetStatisticsInterval;
 
     /* Shared folder LED */
@@ -2116 +2166 @@
     /* disabled memory ballooning */
     pData->u32LastMemoryBalloonSize = 0;
+
+    /* disabled statistics updating */
+    pData->u32LastStatIntervalSize = 0;
 
     /* Clear the event variables.

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -135 +135 @@
     uint32_t    u32MemoryBalloonSize, u32LastMemoryBalloonSize;
 
+    /* statistics interval change request */
+    uint32_t    u32StatIntervalSize, u32LastStatIntervalSize;
+
     /* seamless mode change request */
     bool fLastSeamlessEnabled, fSeamlessEnabled;