Changeset 43618 in vbox for trunk/src/VBox/Main/src-server/solaris

Timestamp:

Oct 11, 2012 1:59:10 PM (12 years ago)

Author:

vboxsync

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

81331

Message:

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

Location:

trunk/src/VBox/Main/src-server/solaris

Files:

• NetIf-solaris.cpp (modified) (2 diffs)
• PerformanceSolaris.cpp (modified) (2 diffs)

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

@@ -48 +48 @@
 #include <net/if.h>
 #include <sys/types.h>
+#include <kstat.h>
 
 #include "DynLoadLibSolaris.h"
-
-static uint64_t 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)
@@ -103 +74 @@
 }
 
+static uint64_t kstatGet(const char *name)
+{
+    kstat_ctl_t *kc;
+    uint64_t uSpeed = 0;
+
+    if ((kc = kstat_open()) == 0)
+    {
+        LogRel(("kstat_open() -> %d\n", errno));
+        return 0;
+    }
+
+    kstat_t *ksAdapter = kstat_lookup(kc, "link", -1, (char *)name);
+    if (ksAdapter == 0)
+    {
+        char szModule[KSTAT_STRLEN];
+        uint32_t uInstance = getInstance(name, szModule);
+        ksAdapter = kstat_lookup(kc, szModule, uInstance, "phys");
+        if (ksAdapter == 0)
+            ksAdapter = kstat_lookup(kc, szModule, uInstance, name);
+    }
+    if (ksAdapter == 0)
+        LogRel(("Failed to get network statistics for %s\n", name));
+    else if (kstat_read(kc, ksAdapter, 0) == -1)
+        LogRel(("kstat_read(%s) -> %d\n", name, errno));
+    else
+    {
+        kstat_named_t *kn;
+        if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"ifspeed")) == 0)
+            LogRel(("kstat_data_lookup(ifspeed) -> %d, name=%s\n", errno, name));
+        else
+            uSpeed = kn->value.ul;
+    }
+    kstat_close(kc);
+    return uSpeed;
+}
+
 static void queryIfaceSpeed(PNETIFINFO pInfo)
 {
-    char szMask[RTPATH_MAX];
-    RTStrPrintf(szMask, sizeof(szMask), "*:*:%s:ifspeed", pInfo->szShortName);
-    uint64_t uSpeed = kstatGet(szMask);
-    if (uSpeed == 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);
-        uSpeed = kstatGet(szMask);
-        if (uSpeed == 0)
-            LogRel(("queryIfaceSpeed: failed to get speed for %s(instance=%u) via kstat\n", szDevName, uInstance));
-    }
-    pInfo->uSpeedMbits = uSpeed / 1000000; /* bits -> Mbits */
+    pInfo->uSpeedMbits = kstatGet(pInfo->szShortName) / 1000000; /* bits -> Mbits */
 }
 

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

@@ -289 +289 @@
 {
     AssertReturn(strlen(name) < KSTAT_STRLEN, VERR_INVALID_PARAMETER);
-    kstat_t *ksAdapter = kstat_lookup(mKC, NULL, -1, (char *)name);
+    LogFlowThisFunc(("m=%s i=%d n=%s\n", "link", -1, name));
+    kstat_t *ksAdapter = kstat_lookup(mKC, "link", -1, (char *)name);
     if (ksAdapter == 0)
     {
         char szModule[KSTAT_STRLEN];
         uint32_t uInstance = getInstance(name, szModule);
-        ksAdapter = kstat_lookup(mKC, szModule, uInstance, NULL);
+        LogFlowThisFunc(("m=%s i=%u n=%s\n", szModule, uInstance, "phys"));
+        ksAdapter = kstat_lookup(mKC, szModule, uInstance, "phys");
         if (ksAdapter == 0)
         {
-            LogRel(("Failed to get network statistics for %s\n", name));
-            return VERR_INTERNAL_ERROR;
+            LogFlowThisFunc(("m=%s i=%u n=%s\n", szModule, uInstance, name));
+            ksAdapter = kstat_lookup(mKC, szModule, uInstance, name);
+            if (ksAdapter == 0)
+            {
+                LogRel(("Failed to get network statistics for %s\n", name));
+                return VERR_INTERNAL_ERROR;
+            }
         }
     }
@@ -309 +316 @@
     if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"rbytes")) == 0)
     {
-        LogRel(("kstat_data_lookup(rbytes) -> %d\n", errno));
+        LogRel(("kstat_data_lookup(rbytes) -> %d, name=%s\n", errno, name));
         return VERR_INTERNAL_ERROR;
     }