Changeset 43949 in vbox

Timestamp:

Nov 23, 2012 1:43:19 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metics: VM disk usage metric (#6345)

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (1 diff)
• include/Performance.h (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (4 diffs)
• src-server/Performance.cpp (modified) (2 diffs)

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

@@ -944 +944 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
+    void getDiskList(MediaList &list);
     void registerMetrics(PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid);
 

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

@@ -32 +32 @@
 #include <vector>
 #include <queue>
+
+#include "MediumImpl.h"
 
 /* Forward decl. */
@@ -693 +695 @@
 
 #ifndef VBOX_COLLECTOR_TEST_CASE
+    typedef std::list<ComObjPtr<Medium> > MediaList;
+    class MachineDiskUsage : public BaseMetric
+    {
+    public:
+        MachineDiskUsage(CollectorHAL *hal, ComPtr<IUnknown> object, MediaList &disks, SubMetric *used)
+        : BaseMetric(hal, "Disk/Usage", object), mDisks(disks), mUsed(used) {};
+        ~MachineDiskUsage() { delete mUsed; };
+
+        void init(ULONG period, ULONG length);
+        void preCollect(CollectorHints& hints, uint64_t iTick);
+        void collect();
+        const char *getUnit() { return "mB"; };
+        ULONG getMinValue() { return 0; };
+        ULONG getMaxValue() { return INT32_MAX; };
+        ULONG getScale() { return 1; }
+    private:
+        MediaList   mDisks;
+        SubMetric *mUsed;
+    };
+
     /*
      * Although MachineNetRate is measured for VM, not for the guest, it is

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -11461 +11461 @@
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
 
+void Machine::getDiskList(MediaList &list)
+{
+    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
+         it != mMediaData->mAttachments.end();
+         ++it)
+    {
+        MediumAttachment* pAttach = *it;
+        /* just in case */
+        AssertStmt(pAttach, continue);
+
+        AutoCaller localAutoCallerA(pAttach);
+        if (FAILED(localAutoCallerA.rc())) continue;
+
+        AutoReadLock local_alockA(pAttach COMMA_LOCKVAL_SRC_POS);
+
+        if (pAttach->getType() == DeviceType_HardDisk)
+            list.push_back(pAttach->getMedium());
+    }
+}
+
 void Machine::registerMetrics(PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid)
 {
@@ -11474 +11494 @@
     pm::SubMetric *ramUsageUsed  = new pm::SubMetric("RAM/Usage/Used",
         "Size of resident portion of VM process in memory.");
+    pm::SubMetric *diskUsageUsed  = new pm::SubMetric("Disk/Usage/Used",
+        "Actual size of all VM disks combined.");
     pm::SubMetric *machineNetRx = new pm::SubMetric("Net/Rate/Rx",
         "Network receive rate.");
@@ -11485 +11507 @@
                                                        ramUsageUsed);
     aCollector->registerBaseMetric(ramUsage);
+    MediaList disks;
+    getDiskList(disks);
+    pm::BaseMetric *diskUsage = new pm::MachineDiskUsage(hal, aMachine, disks,
+                                                         diskUsageUsed);
+    aCollector->registerBaseMetric(diskUsage);
 
     aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, 0));
@@ -11507 +11534 @@
                                               new pm::AggregateMin()));
     aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(diskUsage, diskUsageUsed, 0));
+    aCollector->registerMetric(new pm::Metric(diskUsage, diskUsageUsed,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(diskUsage, diskUsageUsed,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(diskUsage, diskUsageUsed,
                                               new pm::AggregateMax()));
 

trunk/src/VBox/Main/src-server/Performance.cpp

@@ -25 +25 @@
 #include "VirtualBoxImpl.h"
 #include "MachineImpl.h"
+#include "MediumImpl.h"
+#include "AutoCaller.h"
 #endif
 #include "Performance.h"
@@ -1006 +1008 @@
 
 #ifndef VBOX_COLLECTOR_TEST_CASE
+void MachineDiskUsage::init(ULONG period, ULONG length)
+{
+    mPeriod = period;
+    mLength = length;
+    mUsed->init(mLength);
+}
+
+void MachineDiskUsage::preCollect(CollectorHints& /* hints */, uint64_t /* iTick */)
+{
+}
+
+void MachineDiskUsage::collect()
+{
+    ULONG used = 0;
+
+    for (MediaList::iterator it = mDisks.begin(); it != mDisks.end(); ++it)
+    {
+        ComObjPtr<Medium> pMedium = *it;
+
+        /* just in case */
+        AssertStmt(!pMedium.isNull(), continue);
+
+        AutoCaller localAutoCaller(pMedium);
+        if (FAILED(localAutoCaller.rc())) continue;
+
+        AutoReadLock local_alock(pMedium COMMA_LOCKVAL_SRC_POS);
+
+        used += pMedium->getSize() / (1024 * 1024);
+    }
+
+    mUsed->put(used);
+}
+
 void MachineNetRate::init(ULONG period, ULONG length)
 {