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

Timestamp:

Feb 18, 2013 6:38:05 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Do not query interface speed for inactive ones on Solaris (#6345)

File:

• trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp (modified) (3 diffs)

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

@@ -74 +74 @@
 }
 
-static uint64_t kstatGet(const char *name)
+static uint32_t kstatGet(const char *name)
 {
     kstat_ctl_t *kc;
-    uint64_t uSpeed = 0;
+    uint32_t uSpeed = 0;
 
     if ((kc = kstat_open()) == 0)
@@ -104 +104 @@
             LogRel(("kstat_data_lookup(ifspeed) -> %d, name=%s\n", errno, name));
         else
-            uSpeed = kn->value.ul;
+            uSpeed = kn->value.ul / 1000000; /* bits -> Mbits */
     }
     kstat_close(kc);
+    LogFlow(("kstatGet(%s) -> %u Mbit/s\n", name, uSpeed));
     return uSpeed;
 }
@@ -112 +113 @@
 static void queryIfaceSpeed(PNETIFINFO pInfo)
 {
-    pInfo->uSpeedMbits = kstatGet(pInfo->szShortName) / 1000000; /* bits -> Mbits */
+    /* Don't query interface speed for inactive interfaces (see @bugref{6345}). */
+    if (pInfo->enmStatus == NETIF_S_UP)
+        pInfo->uSpeedMbits =  kstatGet(pInfo->szShortName);
+    else
+        pInfo->uSpeedMbits = 0;
+    LogFlow(("queryIfaceSpeed(%s) -> %u\n", pInfo->szShortName, pInfo->uSpeedMbits));
 }