Changeset 26290 in vbox for trunk/src/VBox

Timestamp:

Feb 5, 2010 2:27:19 PM (15 years ago)

Author:

vboxsync

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

57359

Message:

Statistics interval controllable from within the guest from now on.

Location:

trunk/src/VBox

Files:

• Devices/VMMDev/VMMDev.cpp (modified) (4 diffs)
• Main/GuestImpl.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (4 diffs)
• Main/VMMDevInterface.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/GuestImpl.h (modified) (2 diffs)
• Main/include/MachineImpl.h (modified) (2 diffs)

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

@@ -1392 +1392 @@
         }
 
-        case VMMDevReq_GetStatisticsChangeRequest:
-        {
-            Log(("VMMDevReq_GetStatisticsChangeRequest\n"));
-            if (pRequestHeader->size != sizeof(VMMDevGetStatisticsChangeRequest))
-            {
-                AssertFailed();
-                pRequestHeader->rc = VERR_INVALID_PARAMETER;
-            }
-            else
-            {
-                VMMDevGetStatisticsChangeRequest *statIntervalChangeRequest = (VMMDevGetStatisticsChangeRequest*)pRequestHeader;
-                /* just pass on the information */
-                Log(("VMMDev: returning statistics interval %d seconds\n", pThis->u32StatIntervalSize));
-                statIntervalChangeRequest->u32StatInterval = pThis->u32StatIntervalSize;
-
-                if (statIntervalChangeRequest->eventAck == VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST)
-                {
-                    /* Remember which mode the client has queried. */
-                    pThis->u32LastStatIntervalSize= pThis->u32StatIntervalSize;
-                }
-
-                pRequestHeader->rc = VINF_SUCCESS;
-            }
-            break;
-        }
-
         case VMMDevReq_ReportGuestStats:
         {
@@ -2069 +2043 @@
 }
 
-static DECLCALLBACK(int) vmmdevSetStatisticsInterval(PPDMIVMMDEVPORT pInterface, uint32_t ulStatInterval)
-{
-    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
-    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-
-    /* Verify that the new resolution is different and that guest does not yet know about it. */
-    bool fSame = (pThis->u32LastStatIntervalSize == ulStatInterval);
-
-    Log(("vmmdevSetStatisticsInterval: old=%d. new=%d\n", pThis->u32LastStatIntervalSize, ulStatInterval));
-
-    if (!fSame)
-    {
-        /* we could validate the information here but hey, the guest can do that as well! */
-        pThis->u32StatIntervalSize = ulStatInterval;
-
-        /* IRQ so the guest knows what's going on */
-        VMMDevNotifyGuest (pThis, VMMDEV_EVENT_STATISTICS_INTERVAL_CHANGE_REQUEST);
-    }
-
-    PDMCritSectLeave(&pThis->CritSect);
-    return VINF_SUCCESS;
-}
-
 
 static DECLCALLBACK(int) vmmdevSetCredentials(PPDMIVMMDEVPORT pInterface, const char *pszUsername,
@@ -2479 +2430 @@
     /* disabled memory ballooning */
     pThis->u32LastMemoryBalloonSize = 0;
-
-    /* disabled statistics updating */
-    pThis->u32LastStatIntervalSize = 0;
 
     /* Clear the "HGCM event enabled" flag so the event can be automatically reenabled.  */
@@ -2593 +2541 @@
     pThis->IPort.pfnRequestSeamlessChange  = vmmdevRequestSeamlessChange;
     pThis->IPort.pfnSetMemoryBalloon       = vmmdevSetMemoryBalloon;
-    pThis->IPort.pfnSetStatisticsInterval  = vmmdevSetStatisticsInterval;
     pThis->IPort.pfnVRDPChange             = vmmdevVRDPChange;
     pThis->IPort.pfnCpuHotUnplug           = vmmdevCpuHotUnplug;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -82 +82 @@
         mMemoryBalloonSize = 0;                     /* Default is no ballooning */
 
-    ULONG aStatUpdateInterval;
-    ret = mParent->machine()->COMGETTER(StatisticsUpdateInterval)(&aStatUpdateInterval);
-    if (ret == S_OK)
-        mStatUpdateInterval = aStatUpdateInterval;
-    else
-        mStatUpdateInterval = 0;                    /* Default is not to report guest statistics at all */
-
     /* invalidate all stats */
     for (int i=0;i<GuestStatisticType_MaxVal;i++)
@@ -225 +218 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(StatisticsUpdateInterval) (ULONG *aUpdateInterval)
-{
-    CheckComArgOutPointerValid(aUpdateInterval);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aUpdateInterval = mStatUpdateInterval;
-
-    return S_OK;
-}
-
-STDMETHODIMP Guest::COMSETTER(StatisticsUpdateInterval) (ULONG aUpdateInterval)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT ret = mParent->machine()->COMSETTER(StatisticsUpdateInterval)(aUpdateInterval);
-    if (ret == S_OK)
-    {
-        mStatUpdateInterval = aUpdateInterval;
-        /* forward the information to the VMM device */
-        VMMDev *vmmDev = mParent->getVMMDev();
-        if (vmmDev)
-            vmmDev->getVMMDevPort()->pfnSetStatisticsInterval(vmmDev->getVMMDevPort(), aUpdateInterval);
-    }
-
-    return ret;
-}
 
 STDMETHODIMP Guest::SetCredentials(IN_BSTR aUserName, IN_BSTR aPassword,

trunk/src/VBox/Main/MachineImpl.cpp

@@ -157 +157 @@
     mCPUHotPlugEnabled = false;
     mMemoryBalloonSize = 0;
-    mStatisticsUpdateInterval = 0;
     mVRAMSize = 8;
     mAccelerate3DEnabled = false;
@@ -1159 +1158 @@
     return S_OK;
 }
-
-/** @todo this method should not be public */
-STDMETHODIMP Machine::COMGETTER(StatisticsUpdateInterval) (ULONG *statisticsUpdateInterval)
-{
-    if (!statisticsUpdateInterval)
-        return E_POINTER;
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *statisticsUpdateInterval = mHWData->mStatisticsUpdateInterval;
-
-    return S_OK;
-}
-
-/** @todo this method should not be public */
-STDMETHODIMP Machine::COMSETTER(StatisticsUpdateInterval) (ULONG statisticsUpdateInterval)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT rc = checkStateDependency(MutableStateDep);
-    if (FAILED(rc)) return rc;
-
-    setModified(IsModified_MachineData);
-    mHWData.backup();
-    mHWData->mStatisticsUpdateInterval = statisticsUpdateInterval;
-
-    return S_OK;
-}
-
 
 STDMETHODIMP Machine::COMGETTER(Accelerate3DEnabled)(BOOL *enabled)
@@ -6272 +6236 @@
         // guest settings
         mHWData->mMemoryBalloonSize = data.ulMemoryBalloonSize;
-        mHWData->mStatisticsUpdateInterval = data.ulStatisticsUpdateInterval;
 
 #ifdef VBOX_WITH_GUEST_PROPS
@@ -7306 +7269 @@
         /* Guest */
         data.ulMemoryBalloonSize = mHWData->mMemoryBalloonSize;
-        data.ulStatisticsUpdateInterval = mHWData->mStatisticsUpdateInterval;
 
         // guest properties

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -403 +403 @@
 }
 
-/**
- * Request the statistics interval
- *
- * @returns VBox status code.
- * @param   pInterface          Pointer to this interface.
- * @param   pulInterval         Pointer to interval in seconds
- * @thread  The emulation thread.
- */
-DECLCALLBACK(int) vmmdevQueryStatisticsInterval(PPDMIVMMDEVCONNECTOR pInterface, uint32_t *pulInterval)
-{
-    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
-    ULONG          val = 0;
-
-    if (!pulInterval)
-        return VERR_INVALID_POINTER;
-
-    /* store that information in IGuest */
-    Guest* guest = pDrv->pVMMDev->getParent()->getGuest();
-    Assert(guest);
-    if (!guest)
-        return VERR_INVALID_PARAMETER; /** @todo wrong error */
-
-    guest->COMGETTER(StatisticsUpdateInterval)(&val);
-    *pulInterval = val;
-    return VINF_SUCCESS;
-}
 
 /**
@@ -736 +710 @@
     pData->Connector.pfnQueryVisibleRegion            = vmmdevQueryVisibleRegion;
     pData->Connector.pfnReportStatistics              = vmmdevReportStatistics;
-    pData->Connector.pfnQueryStatisticsInterval       = vmmdevQueryStatisticsInterval;
     pData->Connector.pfnChangeMemoryBalloon           = vmmdevChangeMemoryBalloon;
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4371 +4371 @@
     </attribute>
 
-    <attribute name="statisticsUpdateInterval" type="unsigned long">
-      <desc>Initial interval to update guest statistics in seconds.</desc>
-    </attribute>
-
     <attribute name="VRAMSize" type="unsigned long">
       <desc>Video memory size in megabytes.</desc>
@@ -8311 +8307 @@
     <attribute name="memoryBalloonSize" type="unsigned long">
       <desc>Guest system memory balloon size in megabytes.</desc>
-    </attribute>
-
-    <attribute name="statisticsUpdateInterval" type="unsigned long">
-      <desc>Interval to update guest statistics in seconds.</desc>
     </attribute>
 

trunk/src/VBox/Main/include/GuestImpl.h

@@ -65 +65 @@
     STDMETHOD(COMGETTER(MemoryBalloonSize)) (ULONG *aMemoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize)) (ULONG aMemoryBalloonSize);
-    STDMETHOD(COMGETTER(StatisticsUpdateInterval)) (ULONG *aUpdateInterval);
-    STDMETHOD(COMSETTER(StatisticsUpdateInterval)) (ULONG aUpdateInterval);
 
     // IGuest methods
@@ -101 +99 @@
 
     ULONG mMemoryBalloonSize;
-    ULONG mStatUpdateInterval;
 
     ULONG mCurrentGuestStat[GuestStatisticType_MaxVal];

trunk/src/VBox/Main/include/MachineImpl.h

@@ -269 +269 @@
         ULONG          mMemorySize;
         ULONG          mMemoryBalloonSize;
-        ULONG          mStatisticsUpdateInterval;
         ULONG          mVRAMSize;
         ULONG          mMonitorCount;
@@ -376 +375 @@
     STDMETHOD(COMGETTER(MemoryBalloonSize))(ULONG *memoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize))(ULONG memoryBalloonSize);
-    STDMETHOD(COMGETTER(StatisticsUpdateInterval))(ULONG *statisticsUpdateInterval);
-    STDMETHOD(COMSETTER(StatisticsUpdateInterval))(ULONG statisticsUpdateInterval);
     STDMETHOD(COMGETTER(VRAMSize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(VRAMSize))(ULONG memorySize);