儲存庫 vbox 的更動 12546

時間撮記:

2008-9-17 下午05:11:15 (16 年 以前)

作者:

vboxsync

訊息:

PerfAPI: Improved Linux collector

位置:

trunk/src/VBox/Main

檔案:

• include/Performance.h (修改) (1 筆差異)
• linux/PerformanceLinux.cpp (修改) (6 筆差異)
• testcase/tstCollector.cpp (修改) (3 筆差異)

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

@@ -86 +86 @@
 
         CollectorHints() : mHostFlags(COLLECT_NONE) {}
-        void collectHostCpuLoad() { mHostFlags |= COLLECT_CPU_LOAD; }
-        void collectHostRamUsage() { mHostFlags |= COLLECT_RAM_USAGE; }
+        void collectHostCpuLoad()
+            { mHostFlags |= COLLECT_CPU_LOAD; }
+        void collectHostRamUsage()
+            { mHostFlags |= COLLECT_RAM_USAGE; }
         void collectProcessCpuLoad(RTPROCESS process)
-        {
-            findProcess(process).second |= COLLECT_CPU_LOAD;
-        }
+            { findProcess(process).second |= COLLECT_CPU_LOAD; }
         void collectProcessRamUsage(RTPROCESS process)
-        {
-            findProcess(process).second |= COLLECT_RAM_USAGE;
-        }
-        bool isHostCpuLoadCollected() { return (mHostFlags & COLLECT_CPU_LOAD) != 0; }
-        bool isHostRamUsageCollected() { return (mHostFlags & COLLECT_RAM_USAGE) != 0; }
+            { findProcess(process).second |= COLLECT_RAM_USAGE; }
+        bool isHostCpuLoadCollected() const
+            { return (mHostFlags & COLLECT_CPU_LOAD) != 0; }
+        bool isHostRamUsageCollected() const
+            { return (mHostFlags & COLLECT_RAM_USAGE) != 0; }
         bool isProcessCpuLoadCollected(RTPROCESS process)
-        {
-            return (findProcess(process).second & COLLECT_CPU_LOAD) != 0;
-        }
+            { return (findProcess(process).second & COLLECT_CPU_LOAD) != 0; }
         bool isProcessRamUsageCollected(RTPROCESS process)
-        {
-            return (findProcess(process).second & COLLECT_RAM_USAGE) != 0;
-        }
+            { return (findProcess(process).second & COLLECT_RAM_USAGE) != 0; }
         void getProcesses(std::vector<RTPROCESS>& processes) const
         {

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;
 }
 

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

@@ -51 +51 @@
 #endif
 
-pm::CollectorHAL *createCollector()
-{
-#ifdef RT_OS_SOLARIS
-    return new pm::CollectorSolaris();
-#endif
-#ifdef RT_OS_LINUX
-    return new pm::CollectorLinux();
-#endif
-#ifdef RT_OS_WINDOWS
-    return new pm::CollectorWin();
-#endif
-#ifdef RT_OS_OS2
-    return new pm::CollectorOS2();
-#endif
-#ifdef RT_OS_DARWIN
-    return new pm::CollectorDarwin();
-#endif
-    return 0;
-}
-
 #define RUN_TIME_MS        1000
 
@@ -128 +108 @@
     uint64_t start;
     unsigned int nCalls;
-    uint32_t totalTime = 0;
     /* Pre-collect */
     CALLS_PER_SECOND(preCollect(hints));
@@ -199 +178 @@
 #endif
 
-    pm::CollectorHAL *collector = createCollector();
+    pm::CollectorHAL *collector = pm::createHAL();
     if (!collector)
     {