Changeset 4528 in vbox for trunk

Timestamp:

Sep 5, 2007 9:19:39 AM (17 years ago)

Author:

vboxsync

Message:

Guest statistics interval updates (xml, imachine, iguest)

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (7 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -177 +177 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    AutoReaderLock alock (this);
+    AutoLock alock (this);
 
     HRESULT ret = mParent->machine()->COMSETTER(MemoryBalloonSize)(aMemoryBalloonSize);
@@ -212 +212 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    AutoReaderLock alock (this);
-
-    mStatUpdateInterval = aUpdateInterval;
-
-    return S_OK;
+    AutoLock alock (this);
+
+    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;
 }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -166 +166 @@
     mMemorySize = 128;
     mMemoryBalloonSize = 0;
+    mStatisticsUpdateInterval = 0;
     mVRAMSize = 8;
     mMonitorCount = 1;
@@ -191 +192 @@
     if (mMemorySize != that.mMemorySize ||
         mMemoryBalloonSize != that.mMemoryBalloonSize ||
+        mStatisticsUpdateInterval != that.mStatisticsUpdateInterval ||
         mVRAMSize != that.mVRAMSize ||
         mMonitorCount != that.mMonitorCount ||
@@ -981 +983 @@
 }
 
-
+/** @todo this method should not be public */
 STDMETHODIMP Machine::COMGETTER(MemoryBalloonSize) (ULONG *memoryBalloonSize)
 {
@@ -997 +999 @@
 }
 
+/** @todo this method should not be public */
 STDMETHODIMP Machine::COMSETTER(MemoryBalloonSize) (ULONG memoryBalloonSize)
 {
@@ -1015 +1018 @@
     mHWData.backup();
     mHWData->mMemoryBalloonSize = memoryBalloonSize;
+
+    return S_OK;
+}
+
+/** @todo this method should not be public */
+STDMETHODIMP Machine::COMGETTER(StatisticsUpdateInterval) (ULONG *statisticsUpdateInterval)
+{
+    if (!statisticsUpdateInterval)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *statisticsUpdateInterval = mHWData->mStatisticsUpdateInterval;
+
+    return S_OK;
+}
+
+/** @todo this method should not be public */
+STDMETHODIMP Machine::COMSETTER(StatisticsUpdateInterval) (ULONG statisticsUpdateInterval)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    mHWData.backup();
+    mHWData->mStatisticsUpdateInterval = statisticsUpdateInterval;
 
     return S_OK;
@@ -3773 +3809 @@
                 mHWData->mMemoryBalloonSize = memoryBalloonSize;
 
+                uint32_t statisticsUpdateInterval = 0;
+                CFGLDRQueryUInt32 (GuestNode, "StatisticsUpdateInterval", &statisticsUpdateInterval);
+                mHWData->mStatisticsUpdateInterval = statisticsUpdateInterval;
+
                 CFGLDRReleaseNode (GuestNode);
             }
@@ -5456 +5496 @@
             if (GuestNode)
             {
-                CFGLDRSetUInt32 (GuestNode, "MemoryBalloonSize", mHWData->mMemoryBalloonSize);
+                CFGLDRSetUInt32 (GuestNode, "MemoryBalloonSize",  mHWData->mMemoryBalloonSize);
+                CFGLDRSetUInt32 (GuestNode, "StatisticsUpdateInterval", mHWData->mStatisticsUpdateInterval);                
                 CFGLDRReleaseNode (GuestNode);
             }

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

@@ -2021 +2021 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="dcfb87c4-18a9-4a1e-9b1f-6f68f920535b"
+     uuid="2830ce8c-be5b-4660-b8d5-65d913005b4f"
      wsmap="managed"
      >
@@ -2175 +2175 @@
     </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>

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

@@ -222 +222 @@
         ULONG          mMemorySize;
         ULONG          mMemoryBalloonSize;
+        ULONG          mStatisticsUpdateInterval;
         ULONG          mVRAMSize;
         ULONG          mMonitorCount;
@@ -444 +445 @@
     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);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -384 +384 @@
 
 <xsd:complexType name="TGuest">
-  <xsd:attribute name="MemoryBalloonSize" type="xsd:unsignedInt" default="0"/>
+  <xsd:attribute name="MemoryBalloonSize"  type="xsd:unsignedInt" default="0"/>
+  <xsd:attribute name="StatisticsInterval" type="xsd:unsignedInt" default="0"/>
 </xsd:complexType>