Changeset 43958 in vbox for trunk/src

Timestamp:

Nov 26, 2012 10:37:06 AM (12 years ago)

Author:

vboxsync

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

82302

Message:

Main/Metrics: Host disk size, linux only (#6345)

Location:

trunk/src/VBox/Main

Files:

• include/Performance.h (modified) (2 diffs)
• src-server/HostImpl.cpp (modified) (2 diffs)
• src-server/Performance.cpp (modified) (2 diffs)
• src-server/linux/PerformanceLinux.cpp (modified) (2 diffs)
• testcase/tstCollector.cpp (modified) (1 diff)

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

@@ -373 +373 @@
         /** Returns file system counters in megabytes. */
         virtual int getHostFilesystemUsage(const char *name, ULONG *total, ULONG *used, ULONG *available);
+        /** Returns disk size in bytes. */
+        virtual int getHostDiskSize(const char *name, uint64_t *size);
         /** Returns CPU usage in 1/1000th per cent by a particular process. */
         virtual int getProcessCpuLoad(RTPROCESS process, ULONG *user, ULONG *kernel);
@@ -582 +584 @@
         SubMetric   *mUsed;
         SubMetric   *mAvailable;
+    };
+
+    class HostDiskUsage : public BaseMetric
+    {
+    public:
+        HostDiskUsage(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str diskname, SubMetric *total)
+            : BaseMetric(hal, name, object), mDiskName(diskname), mTotal(total) {};
+        ~HostDiskUsage() { delete mTotal; };
+
+        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:
+        com::Utf8Str mDiskName;
+        SubMetric   *mTotal;
     };
 

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

@@ -2936 +2936 @@
     for (it = disks.begin(); it != disks.end(); ++it)
     {
-        Utf8StrFmt strName("Disk/%s/Load", it->c_str());
-        pm::SubMetric *fsLoadUtil   = new pm::SubMetric(strName + "/Util",
+        Utf8StrFmt strName("Disk/%s", it->c_str());
+        pm::SubMetric *fsLoadUtil   = new pm::SubMetric(strName + "/Load/Util",
             "Percentage of time disk was busy serving I/O requests.");
-        pm::BaseMetric *fsLoad = new pm::HostDiskLoadRaw(hal, this, strName,
+        pm::SubMetric *fsUsageTotal = new pm::SubMetric(strName + "/Usage/Total",
+            "Disk size.");
+        pm::BaseMetric *fsLoad  = new pm::HostDiskLoadRaw(hal, this, strName + "/Load",
                                                          *it, fsLoadUtil);
         aCollector->registerBaseMetric (fsLoad);
+        pm::BaseMetric *fsUsage = new pm::HostDiskUsage(hal, this, strName + "/Usage",
+                                                        *it, fsUsageTotal);
+        aCollector->registerBaseMetric (fsUsage);
 
         aCollector->registerMetric(new pm::Metric(fsLoad, fsLoadUtil, 0));
@@ -2949 +2954 @@
                                                   new pm::AggregateMin()));
         aCollector->registerMetric(new pm::Metric(fsLoad, fsLoadUtil,
+                                                  new pm::AggregateMax()));
+
+        aCollector->registerMetric(new pm::Metric(fsUsage, fsUsageTotal, 0));
+        aCollector->registerMetric(new pm::Metric(fsUsage, fsUsageTotal,
+                                                  new pm::AggregateAvg()));
+        aCollector->registerMetric(new pm::Metric(fsUsage, fsUsageTotal,
+                                                  new pm::AggregateMin()));
+        aCollector->registerMetric(new pm::Metric(fsUsage, fsUsageTotal,
                                                   new pm::AggregateMax()));
     }

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

@@ -82 +82 @@
 
 int CollectorHAL::getHostFilesystemUsage(const char * /* name */, ULONG * /* total */, ULONG * /* used */, ULONG * /* available */)
+{
+    return E_NOTIMPL;
+}
+
+int CollectorHAL::getHostDiskSize(const char * /* name */, uint64_t * /* size */)
 {
     return E_NOTIMPL;
@@ -859 +864 @@
 }
 
+void HostDiskUsage::init(ULONG period, ULONG length)
+{
+    mPeriod = period;
+    mLength = length;
+    mTotal->init(mLength);
+}
+
+void HostDiskUsage::preCollect(CollectorHints& /* hints */, uint64_t /* iTick */)
+{
+}
+
+void HostDiskUsage::collect()
+{
+    uint64_t total;
+    int rc = mHAL->getHostDiskSize(mDiskName.c_str(), &total);
+    if (RT_SUCCESS(rc))
+        mTotal->put((ULONG)(total / (1024*1024)));
+}
+
 #ifndef VBOX_COLLECTOR_TEST_CASE
 void HostRamVmm::init(ULONG period, ULONG length)

trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp

@@ -49 +49 @@
     virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
     virtual int getHostFilesystemUsage(const char *name, ULONG *total, ULONG *used, ULONG *available);
+    virtual int getHostDiskSize(const char *name, uint64_t *size);
     virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
 
@@ -242 +243 @@
 }
 
+int CollectorLinux::getHostDiskSize(const char *name, uint64_t *size)
+{
+    int rc = VINF_SUCCESS;
+    char *pszName = NULL;
+    long long unsigned int u64Size;
+
+    RTStrAPrintf(&pszName, "/sys/block/%s/size", name);
+    Assert(pszName);
+    FILE *f = fopen(pszName, "r");
+    RTMemFree(pszName);
+
+    if (f)
+    {
+        if (fscanf(f, "%llu", &u64Size) == 1)
+            *size = u64Size * 512;
+        else
+            rc = VERR_FILE_IO_ERROR;
+        fclose(f);
+    }
+    else
+        rc = VERR_ACCESS_DENIED;
+
+    return rc;
+}
+
 int CollectorLinux::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
 {

trunk/src/VBox/Main/testcase/tstCollector.cpp

@@ -231 +231 @@
     {
         RTPrintf("tstCollector: getDiskListByFs(%s) returned empty list\n", FSNAME);
+        return 1;
+    }
+
+    uint64_t diskSize = 0;
+    rc = collector->getHostDiskSize(disks.front().c_str(), &diskSize);
+    RTPrintf("tstCollector: TESTING - Disk size (%s) = %llu\n", disks.front().c_str(), diskSize);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("tstCollector: getHostDiskSize() -> %Rrc\n", rc);
         return 1;
     }