Changeset 43538 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 4, 2012 12:24:20 PM (13 years ago)

Author:

vboxsync

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

81139

Message:

Main/Metrics: Host network interface metrics for Solaris (#6345)

Location:

trunk/src/VBox/Main/src-server

Files:

• HostNetworkInterfaceImpl.cpp (modified) (6 diffs)
• linux/NetIf-linux.cpp (modified) (2 diffs)
• solaris/NetIf-solaris.cpp (modified) (3 diffs)
• solaris/PerformanceSolaris.cpp (modified) (3 diffs)

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

@@ -89 +89 @@
 void HostNetworkInterface::registerMetrics(PerformanceCollector *aCollector, ComPtr<IUnknown> objptr)
 {
-    LogFlowThisFunc(("mInterfaceName={%ls}, mGuid={%s}\n",
-                      mInterfaceName.raw(), mGuid.toString().c_str()));
+    LogFlowThisFunc(("mShortName={%ls}, mInterfaceName={%ls}, mGuid={%s}, mSpeedMbits=%u\n",
+                     mShortName.raw(), mInterfaceName.raw(), mGuid.toString().c_str(), m.speedMbits));
     pm::CollectorHAL *hal = aCollector->getHAL();
     /* Create sub metrics */
-    Utf8StrFmt strName("Net/%ls/Load", mInterfaceName.raw());
+    Utf8StrFmt strName("Net/%ls/Load", mShortName.raw());
     pm::SubMetric *networkLoadRx   = new pm::SubMetric(strName + "/Rx",
         "Percentage of network interface bandwidth used.");
@@ -100 +100 @@
 
     /* Create and register base metrics */
-    pm::BaseMetric *networkLoad = new pm::HostNetworkLoadRaw(hal, objptr, strName, Utf8Str(mInterfaceName), m.speedMbytes, networkLoadRx, networkLoadTx);
+    pm::BaseMetric *networkLoad = new pm::HostNetworkLoadRaw(hal, objptr, strName, Utf8Str(mShortName), m.speedMbits, networkLoadRx, networkLoadTx);
     aCollector->registerBaseMetric(networkLoad);
 
@@ -122 +122 @@
 void HostNetworkInterface::unregisterMetrics(PerformanceCollector *aCollector, ComPtr<IUnknown> objptr)
 {
-    LogFlowThisFunc(("mInterfaceName={%ls}, mGuid={%s}\n",
-                      mInterfaceName.raw(), mGuid.toString().c_str()));
-    Utf8StrFmt name("Net/%ls/Load", mInterfaceName.raw());
+    LogFlowThisFunc(("mShortName={%ls}, mInterfaceName={%ls}, mGuid={%s}\n",
+                     mShortName.raw(), mInterfaceName.raw(), mGuid.toString().c_str()));
+    Utf8StrFmt name("Net/%ls/Load", mShortName.raw());
     aCollector->unregisterMetricsFor(objptr, name + "/*");
     aCollector->unregisterBaseMetricsFor(objptr, name);
@@ -150 +150 @@
         m.status = info.enmStatus;
 #endif /* !RT_OS_WINDOWS */
-        m.speedMbytes = info.uSpeedMbytes;
+        m.speedMbits = info.uSpeedMbits;
         return S_OK;
     }
@@ -183 +183 @@
     unconst(mGuid) = pIf->Uuid;
     if (pIf->szShortName[0])
+    {
         unconst(mNetworkName) = composeNetworkName(pIf->szShortName);
+        unconst(mShortName)   = pIf->szShortName;
+    }
     else
+    {
         unconst(mNetworkName) = composeNetworkName(aInterfaceName);
+        unconst(mShortName)   = aInterfaceName;
+    }
     mIfType = ifType;
 
@@ -201 +207 @@
     m.status = pIf->enmStatus;
 #endif /* !RT_OS_WINDOWS */
-    m.speedMbytes = pIf->uSpeedMbytes;
+    m.speedMbits = pIf->uSpeedMbits;
 
     /* Confirm a successful initialization */

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

@@ -157 +157 @@
         RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/speed", pszName);
         fp = fopen(szBuf, "r");
-        if (fp && fscanf(fp, "%u", &pInfo->uSpeedMbytes) == 1)
+        if (fp && fscanf(fp, "%u", &pInfo->uSpeedMbits) == 1)
             fclose(fp);
         else
@@ -164 +164 @@
             int rc = NetIfAdpCtlOut(pszName, "speed", szBuf, sizeof(szBuf));
             if (RT_SUCCESS(rc))
-                pInfo->uSpeedMbytes = RTStrToUInt32(szBuf);
+                pInfo->uSpeedMbits = RTStrToUInt32(szBuf);
             else
-                pInfo->uSpeedMbytes = 0;
+                pInfo->uSpeedMbits = 0;
         }
     }

trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp

@@ -25 +25 @@
 #include <iprt/err.h>
 #include <iprt/ctype.h>
+#include <iprt/path.h>
 #include <list>
 
@@ -49 +50 @@
 
 #include "DynLoadLibSolaris.h"
+
+static uint64 kstatGet(const char *pszMask)
+{
+    char szBuf[RTPATH_MAX];
+    RTStrPrintf(szBuf, sizeof(szBuf),
+                "/usr/bin/kstat -c net -p %s", pszMask);
+    uint64_t uSpeed = 0;
+    FILE *fp = popen(szBuf, "r");
+    LogFlowFunc(("popen(%s) returned %p\n", szBuf, fp));
+    if (fp)
+    {
+        if (fgets(szBuf, sizeof(szBuf), fp))
+        {
+            LogFlowFunc(("fgets returned %s\n", szBuf));
+            char *pszDigit = szBuf;
+            /* Skip the id string */
+            int i = 0;
+            while (i++ < sizeof(szBuf) && *pszDigit && !RT_C_IS_SPACE(*pszDigit))
+                pszDigit++;
+            while (i++ < sizeof(szBuf) && *pszDigit && !RT_C_IS_DIGIT(*pszDigit))
+                pszDigit++;
+            LogFlowFunc(("located number %s\n", pszDigit));
+            uSpeed = RTStrToUInt64(pszDigit);
+        }
+        else
+            LogFlowFunc(("fgets returned nothing\n"));
+        fclose(fp);
+    }
+    return uSpeed;
+}
+
+static uint32_t getInstance(const char *pszIfaceName, char *pszDevName)
+{
+    /*
+     * Get the instance number from the interface name, then clip it off.
+     */
+    int cbInstance = 0;
+    int cbIface = strlen(pszIfaceName);
+    const char *pszEnd = pszIfaceName + cbIface - 1;
+    for (int i = 0; i < cbIface - 1; i++)
+    {
+        if (!RT_C_IS_DIGIT(*pszEnd))
+            break;
+        cbInstance++;
+        pszEnd--;
+    }
+
+    uint32_t uInstance = RTStrToUInt32(pszEnd + 1);
+    strncpy(pszDevName, pszIfaceName, cbIface - cbInstance);
+    pszDevName[cbIface - cbInstance] = '\0';
+    return uInstance;
+}
+
+static void queryIfaceSpeed(PNETIFINFO pInfo)
+{
+    char szMask[RTPATH_MAX];
+    RTStrPrintf(szMask, sizeof(szMask), "*:*:%s:ifspeed", pInfo->szShortName);
+    pInfo->uSpeedMbits = kstatGet(szMask);
+    if (pInfo->uSpeedMbits == 0)
+    {
+        Log(("queryIfaceSpeed: failed to get speed for %s via kstat(%s)\n", pInfo->szShortName, szMask));
+        /* Lets try module:instance approach */
+        char szDevName[sizeof(pInfo->szShortName)];
+        uint32_t uInstance = getInstance(pInfo->szShortName, szDevName);
+        RTStrPrintf(szMask, sizeof(szMask), "%s:%u:*:ifspeed",
+                    szDevName, uInstance);
+        pInfo->uSpeedMbits = kstatGet(szMask);
+        if (pInfo->uSpeedMbits == 0)
+            LogRel(("queryIfaceSpeed: failed to get speed for %s(instance=%u) via kstat\n", szDevName, uInstance));
+    }
+    pInfo->uSpeedMbits /= 1000000; /* bits -> Mbits */
+}
 
 static void vboxSolarisAddHostIface(char *pszIface, int Instance, void *pvHostNetworkInterfaceList)
@@ -209 +282 @@
     else
         enmType = HostNetworkInterfaceType_HostOnly;
+    queryIfaceSpeed(&Info);
     ComObjPtr<HostNetworkInterface> IfObj;
     IfObj.createObject();

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -28 +28 @@
 #include <sys/time.h>
 
+#include <iprt/ctype.h>
 #include <iprt/err.h>
 #include <iprt/string.h>
@@ -46 +47 @@
 
     virtual int getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
+    virtual int getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx);
     virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
 private:
+    static uint32_t getInstance(const char *pszIfaceName, char *pszDevName);
     kstat_ctl_t *mKC;
     kstat_t     *mSysPages;
@@ -261 +264 @@
 }
 
-}
+uint32_t CollectorSolaris::getInstance(const char *pszIfaceName, char *pszDevName)
+{
+    /*
+     * Get the instance number from the interface name, then clip it off.
+     */
+    int cbInstance = 0;
+    int cbIface = strlen(pszIfaceName);
+    const char *pszEnd = pszIfaceName + cbIface - 1;
+    for (int i = 0; i < cbIface - 1; i++)
+    {
+        if (!RT_C_IS_DIGIT(*pszEnd))
+            break;
+        cbInstance++;
+        pszEnd--;
+    }
+
+    uint32_t uInstance = RTStrToUInt32(pszEnd + 1);
+    strncpy(pszDevName, pszIfaceName, cbIface - cbInstance);
+    pszDevName[cbIface - cbInstance] = '\0';
+    return uInstance;
+}
+
+int CollectorSolaris::getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx)
+{
+    AssertReturn(strlen(name) < KSTAT_STRLEN, VERR_INVALID_PARAMETER);
+    kstat_t *ksAdapter = kstat_lookup(mKC, NULL, -1, (char *)name);
+    if (ksAdapter == 0)
+    {
+        char szModule[KSTAT_STRLEN];
+        uint32_t uInstance = getInstance(name, szModule);
+        ksAdapter = kstat_lookup(mKC, szModule, uInstance, NULL);
+        if (ksAdapter == 0)
+        {
+            LogRel(("Failed to get network statistics for %s\n", name));
+            return VERR_INTERNAL_ERROR;
+        }
+    }
+    if (kstat_read(mKC, ksAdapter, 0) == -1)
+    {
+        LogRel(("kstat_read(adapter) -> %d\n", errno));
+        return VERR_INTERNAL_ERROR;
+    }
+    kstat_named_t *kn;
+    if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"rbytes")) == 0)
+    {
+        LogRel(("kstat_data_lookup(rbytes) -> %d\n", errno));
+        return VERR_INTERNAL_ERROR;
+    }
+    *rx = kn->value.ul;
+    if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"obytes")) == 0)
+    {
+        LogRel(("kstat_data_lookup(obytes) -> %d\n", errno));
+        return VERR_INTERNAL_ERROR;
+    }
+    *tx = kn->value.ul;
+    return VINF_SUCCESS;
+}
+
+}