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

Timestamp:

Nov 29, 2012 8:58:17 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Do not collect data for unplugged host interfaces (#6345)

Location:

trunk/src/VBox/Main/src-server

Files:

• Performance.cpp (modified) (1 diff)
• linux/NetIf-linux.cpp (modified) (1 diff)

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

@@ -716 +716 @@
         {
             LogFlowThisFunc(("Check cable for %s! speed=%llu period=%d.\n", mShortName.c_str(), mSpeed, getPeriod()));
+            /* We do not collect host network metrics for unplugged interfaces!
             mRx->put(0);
             mTx->put(0);
+            */
         }
         else

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

@@ -170 +170 @@
                 fclose(fp);
             }
+            if (pInfo->uSpeedMbits == 10)
+            {
+                /* Check the cable is plugged in at all */
+                unsigned uCarrier = 0;
+                RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/carrier", pszName);
+                fp = fopen(szBuf, "r");
+                if (fp)
+                {
+                    if (fscanf(fp, "%u", &uCarrier) != 1 || uCarrier == 0)
+                        pInfo->uSpeedMbits = 0;
+                    fclose(fp);
+                }
+            }
+
             if (pInfo->uSpeedMbits == 0)
             {