Changeset 43445 in vbox for trunk/src/VBox/Main/include

Timestamp:

Sep 27, 2012 8:28:59 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Host network metrics, linux only (#6345)

Location:

trunk/src/VBox/Main/include

Files:

• HostImpl.h (modified) (1 diff)
• HostNetworkInterfaceImpl.h (modified) (2 diffs)
• Performance.h (modified) (7 diffs)

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

@@ -145 +145 @@
 #endif
 
+    HRESULT updateNetIfList();
+
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
     void registerMetrics(PerformanceCollector *aCollector);

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

@@ -79 +79 @@
 
     HRESULT setVirtualBox(VirtualBox *pVBox);
+    void registerMetrics(PerformanceCollector *aCollector, ComPtr<IUnknown> objptr);
+    void unregisterMetrics(PerformanceCollector *aCollector, ComPtr<IUnknown> objptr);
 
 private:
@@ -112 +114 @@
 };
 
+typedef std::list<ComObjPtr<HostNetworkInterface> > HostNetworkInterfaceList;
+
 #endif // ____H_H_HOSTNETWORKINTERFACEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -40 +40 @@
     /* CPU load is measured in 1/1000 of per cent. */
     const uint64_t PM_CPU_LOAD_MULTIPLIER = UINT64_C(100000);
+    /* Network load is measured in 1/1000 of per cent. */
+    const uint64_t PM_NETWORK_LOAD_MULTIPLIER = UINT64_C(100000);
+    /* Sampler precision in milliseconds. */
+    const uint64_t PM_SAMPLER_PRECISION_MS = 50;
 
     /* Sub Metrics **********************************************************/
@@ -63 +67 @@
     {
     public:
-        SubMetric(const char *name, const char *description)
+        SubMetric(com::Utf8Str name, const char *description)
         : mName(name), mDescription(description) {};
         void query(ULONG *data);
-        const char *getName() { return mName; };
+        const char *getName() { return mName.c_str(); };
         const char *getDescription() { return mDescription; };
     private:
-        const char *mName;
+        const com::Utf8Str mName;
         const char *mDescription;
     };
@@ -357 +361 @@
         /** Returns CPU usage counters in platform-specific units. */
         virtual int getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
+        /** Returns received and transmitted bytes as well as link speed. */
+        virtual int getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx, uint64_t *speed);
         /** Returns process' CPU usage counter in platform-specific units. */
         virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
@@ -367 +373 @@
     {
     public:
-        BaseMetric(CollectorHAL *hal, const char *name, ComPtr<IUnknown> object)
+        BaseMetric(CollectorHAL *hal, const com::Utf8Str name, ComPtr<IUnknown> object)
             : mPeriod(0), mLength(0), mHAL(hal), mName(name), mObject(object),
               mLastSampleTaken(0), mEnabled(false), mUnregistered(false) {};
@@ -390 +396 @@
         ULONG getPeriod() { return mPeriod; };
         ULONG getLength() { return mLength; };
-        const char *getName() { return mName; };
+        const char *getName() { return mName.c_str(); };
         ComPtr<IUnknown> getObject() { return mObject; };
         bool associatedWith(ComPtr<IUnknown> object) { return mObject == object; };
@@ -398 +404 @@
         ULONG           mLength;
         CollectorHAL    *mHAL;
-        const char      *mName;
+        const com::Utf8Str mName;
         ComPtr<IUnknown> mObject;
         uint64_t         mLastSampleTaken;
@@ -486 +492 @@
         SubMetric *mAvailable;
     };
+
+    class HostNetworkLoadRaw : public BaseMetric
+    {
+    public:
+        HostNetworkLoadRaw(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str ifname, SubMetric *rx, SubMetric *tx)
+            : BaseMetric(hal, name, object), mInterfaceName(ifname), mRx(rx), mTx(tx), mRxPrev(0), mTxPrev(0) {};
+        ~HostNetworkLoadRaw() { delete mRx; delete mTx; };
+
+        void init(ULONG period, ULONG length);
+
+        void preCollect(CollectorHints& hints, uint64_t iTick);
+        void collect();
+        const char *getUnit() { return "%"; };
+        ULONG getMinValue() { return 0; };
+        ULONG getMaxValue() { return PM_NETWORK_LOAD_MULTIPLIER; };
+        ULONG getScale() { return PM_NETWORK_LOAD_MULTIPLIER / 100; }
+
+    private:
+        com::Utf8Str  mInterfaceName;
+        SubMetric    *mRx;
+        SubMetric    *mTx;
+        uint64_t      mRxPrev;
+        uint64_t      mTxPrev;
+    };
+
 
 #ifndef VBOX_COLLECTOR_TEST_CASE