Changeset 27849 in vbox for trunk/src

Timestamp:

Mar 31, 2010 7:33:59 AM (15 years ago)

Author:

vboxsync

Message:

metrics update

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• Performance.cpp (modified) (2 diffs)
• include/MachineImpl.h (modified) (2 diffs)
• include/Performance.h (modified) (9 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8952 +8952 @@
 
     /* Create and register base metrics */
-    pm::BaseMetric *guestCpuLoad = new pm::GuestCpuLoad(hal, aMachine, guestLoadUser, guestLoadKernel, guestLoadIdle);
+    pm::BaseMetric *guestCpuLoad = new pm::GuestCpuLoad(&mGuestHAL, aMachine, guestLoadUser, guestLoadKernel, guestLoadIdle);
     aCollector->registerBaseMetric(guestCpuLoad);
 
-    pm::BaseMetric *guestCpuMem = new pm::GuestRamUsage(hal, aMachine, guestMemTotal, guestMemFree, guestMemBalloon,
+    pm::BaseMetric *guestCpuMem = new pm::GuestRamUsage(&mGuestHAL, aMachine, guestMemTotal, guestMemFree, guestMemBalloon, 
                                                         guestMemCache, guestPagedTotal, guestPagedFree);
     aCollector->registerBaseMetric(guestCpuMem);
 
-    pm::BaseMetric *guestSystem = new pm::GuestSystemUsage(hal, aMachine, guestSystemProc, guestSystemThread);
+    pm::BaseMetric *guestSystem = new pm::GuestSystemUsage(&mGuestHAL, aMachine, guestSystemProc, guestSystemThread);
     aCollector->registerBaseMetric(guestSystem);
 

trunk/src/VBox/Main/Performance.cpp

@@ -66 +66 @@
 }
 
+int CollectorHAL::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
+{
+    return E_NOTIMPL;
+}
+
+int CollectorHAL::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
+{
+    return E_NOTIMPL;
+}
+
+int CollectorHAL::enable()
+{
+    return E_NOTIMPL;
+}
+
+int  CollectorHAL::disable()
+{
+    return E_NOTIMPL;
+}
+
 /* Generic implementations */
 
@@ -97 +117 @@
 
     return VINF_SUCCESS;
+}
+
+CollectorGuestHAL::~CollectorGuestHAL()
+{
+//    if (cEnabled)
+//
+}
+
+int CollectorGuestHAL::enable()
+{
+    return S_OK;
+}
+
+int CollectorGuestHAL::disable()
+{
+    return S_OK;
 }
 

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

@@ -37 +37 @@
 #include "VBox/settings.h"
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
+#include "Performance.h"
 #include "PerformanceImpl.h"
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
@@ -794 +795 @@
     void registerMetrics(PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid);
     void unregisterMetrics(PerformanceCollector *aCollector, Machine *aMachine);
+
+    pm::CollectorGuestHAL   mGuestHAL;
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 

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

@@ -21 +21 @@
  * additional information or have any questions.
  */
-
+#ifndef ___performance_h
+#define ___performance_h
 
 #include <VBox/com/defs.h>
@@ -74 +75 @@
     /* Collector Hardware Abstraction Layer *********************************/
     enum {
-        COLLECT_NONE      = 0x0,
-        COLLECT_CPU_LOAD  = 0x1,
-        COLLECT_RAM_USAGE = 0x2
+        COLLECT_NONE        = 0x0,
+        COLLECT_CPU_LOAD    = 0x1,
+        COLLECT_RAM_USAGE   = 0x2
     };
     typedef int HintFlags;
@@ -141 +142 @@
         virtual int getHostCpuMHz(ULONG *mhz);
         /** Returns the amount of physical memory in kilobytes. */
-        virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available) = 0;
+        virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
         /** Returns CPU usage in 1/1000th per cent by a particular process. */
         virtual int getProcessCpuLoad(RTPROCESS process, ULONG *user, ULONG *kernel);
         /** Returns the amount of memory used by a process in kilobytes. */
-        virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used) = 0;
+        virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
 
         /** Returns CPU usage counters in platform-specific units. */
@@ -151 +152 @@
         /** Returns process' CPU usage counter in platform-specific units. */
         virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
+
+        /** Enable metrics collecting (if applicable) */
+        virtual int enable();
+        /** Disable metrics collecting (if applicable) */
+        virtual int disable();
+    };
+
+    class CollectorGuestHAL : public CollectorHAL
+    {
+    public:
+        CollectorGuestHAL() : cEnabled(0) {};
+        ~CollectorGuestHAL();
+
+        /** Enable metrics collecting (if applicable) */
+        virtual int enable();
+        /** Disable metrics collecting (if applicable) */
+        virtual int disable();
+    protected:
+        unsigned        cEnabled;
     };
 
@@ -173 +193 @@
         bool collectorBeat(uint64_t nowAt);
 
-        void enable() { mEnabled = true; };
-        void disable() { mEnabled = false; };
+        void enable() 
+        { 
+            mEnabled = true; 
+            mHAL->enable();
+        };
+        void disable() 
+        { 
+            mHAL->disable();
+            mEnabled = false; 
+        };
 
         bool isEnabled() { return mEnabled; };
@@ -322 +350 @@
     {
     public:
-        GuestCpuLoad(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *user, SubMetric *kernel, SubMetric *idle)
+        GuestCpuLoad(CollectorGuestHAL *hal, ComPtr<IUnknown> object, SubMetric *user, SubMetric *kernel, SubMetric *idle)
         : BaseMetric(hal, "CPU/Load", object), mUser(user), mKernel(kernel), mIdle(idle) {};
         ~GuestCpuLoad() { delete mUser; delete mKernel; delete mIdle; };
@@ -342 +370 @@
     {
     public:
-        GuestRamUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *free, SubMetric *balloon, SubMetric *cache, SubMetric *pagedtotal, SubMetric *pagedfree)
+        GuestRamUsage(CollectorGuestHAL *hal, ComPtr<IUnknown> object, SubMetric *total, SubMetric *free, SubMetric *balloon, SubMetric *cache, SubMetric *pagedtotal, SubMetric *pagedfree)
         : BaseMetric(hal, "RAM/Usage", object), mTotal(total), mFree(free), mBallooned(balloon), mCache(cache), mPagedTotal(pagedtotal), mPagedFree(pagedfree) {};
         ~GuestRamUsage() { delete mTotal; delete mFree; delete mBallooned; delete mCache; delete mPagedTotal; delete mPagedFree; };
@@ -360 +388 @@
     {
     public:
-        GuestSystemUsage(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *processes, SubMetric *threads)
+        GuestSystemUsage(CollectorGuestHAL *hal, ComPtr<IUnknown> object, SubMetric *processes, SubMetric *threads)
         : BaseMetric(hal, "System/Usage", object), mProcesses(processes), mThreads(threads) {};
         ~GuestSystemUsage() { delete mProcesses; delete mThreads; };
@@ -466 +494 @@
     };
 }
-
+#endif /* ___performance_h */
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */