Changeset 12546 in vbox for trunk/src/VBox/Main/linux

Timestamp:

Sep 17, 2008 5:11:15 PM (17 years ago)

Author:

vboxsync

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

36733

Message:

PerfAPI: Improved Linux collector

File:

• trunk/src/VBox/Main/linux/PerformanceLinux.cpp (modified) (6 diffs)

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

@@ -27 +27 @@
 #include <iprt/param.h>
 #include <iprt/string.h>
+
+#include <map>
+#include <vector>
+
+#include "Logging.h"
 #include "Performance.h"
 
@@ -34 +39 @@
 {
 public:
+    virtual int preCollect(const CollectorHints& hints);
     virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
     virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
@@ -40 +46 @@
     virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
 private:
+    virtual int _getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
     int getRawProcessStats(RTPROCESS process, uint64_t *cpuUser, uint64_t *cpuKernel, ULONG *memPagesUsed);
+
+    struct VMProcessStats
+    {
+        uint64_t cpuUser;
+        uint64_t cpuKernel;
+        ULONG    pagesUsed;
+    };
+
+    typedef std::map<RTPROCESS, VMProcessStats> VMProcessMap;
+
+    VMProcessMap mProcessStats;
+    uint64_t     mUser, mKernel, mIdle;
 };
 
@@ -50 +69 @@
 // Collector HAL for Linux
 
-int CollectorLinux::getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle)
+int CollectorLinux::preCollect(const CollectorHints& hints)
+{
+    std::vector<RTPROCESS> processes;
+    hints.getProcesses(processes);
+
+    std::vector<RTPROCESS>::iterator it;
+    for(it = processes.begin(); it != processes.end(); it++)
+    {
+        VMProcessStats vmStats;
+        int rc = getRawProcessStats(*it, &vmStats.cpuUser, &vmStats.cpuKernel, &vmStats.pagesUsed);
+        if (RT_FAILURE(rc))
+            return rc;
+        mProcessStats[*it] = vmStats;
+    }
+    if (hints.isHostCpuLoadCollected() || mProcessStats.size())
+    {
+        _getRawHostCpuLoad(&mUser, &mKernel, &mIdle);
+    }
+    return VINF_SUCCESS;
+}
+
+int CollectorLinux::_getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle)
 {
     int rc = VINF_SUCCESS;
@@ -74 +114 @@
 }
 
+int CollectorLinux::getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle)
+{
+    *user   = mUser;
+    *kernel = mKernel;
+    *idle   = mIdle;
+    return VINF_SUCCESS;
+}
+
 int CollectorLinux::getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total)
 {
-    int rc = VINF_SUCCESS;
-    uint64_t uHostUser, uHostKernel, uHostIdle;
-
-    rc = getRawHostCpuLoad(&uHostUser, &uHostKernel, &uHostIdle);
-    if (RT_SUCCESS(rc))
-    {
-        ULONG ulTmp;
-        *total = (uint64_t)uHostUser + uHostKernel + uHostIdle;
-        rc = getRawProcessStats(process, user, kernel, &ulTmp);
-    }
-
-    return rc;
+    VMProcessMap::const_iterator it = mProcessStats.find(process);
+
+    if (it == mProcessStats.end())
+    {
+        Log (("No stats pre-collected for process %x\n", process));
+        return VERR_INTERNAL_ERROR;
+    }
+    *user   = it->second.cpuUser;
+    *kernel = it->second.cpuKernel;
+    *total  = mUser + mKernel + mIdle;
+    return VINF_SUCCESS;
 }
 
@@ -119 +166 @@
 int CollectorLinux::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
 {
-    uint64_t u64Tmp;
-    ULONG nPagesUsed;
-    int rc = getRawProcessStats(process, &u64Tmp, &u64Tmp, &nPagesUsed);
-    if (RT_SUCCESS(rc))
-    {
-        Assert(PAGE_SIZE >= 1024);
-        *used = nPagesUsed * (PAGE_SIZE / 1024);
-    }
-    return rc;
+    VMProcessMap::const_iterator it = mProcessStats.find(process);
+
+    if (it == mProcessStats.end())
+    {
+        Log (("No stats pre-collected for process %x\n", process));
+        return VERR_INTERNAL_ERROR;
+    }
+    *used = it->second.pagesUsed * (PAGE_SIZE / 1024);
+    return VINF_SUCCESS;
 }