Changeset 43507 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

Oct 2, 2012 1:22:31 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Alternative way to get link speed for old kernels (#6345)

Location:

trunk/src/VBox/Main/src-server/linux

Files:

• NetIf-linux.cpp (modified) (1 diff)
• PerformanceLinux.cpp (modified) (3 diffs)

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

@@ -149 +149 @@
             fclose(fp);
         }
+        /*
+         * I wish I could do simple ioctl here, but older kernels require root
+         * privileges for any ethtool commands.
+         */
+        char szBuf[256];
+        /* First, we try to retrieve the speed via sysfs. */
+        RTStrPrintf(szBuf, sizeof(szBuf), "/sys/class/net/%s/speed", pszName);
+        fp = fopen(szBuf, "r");
+        if (fp && fscanf(fp, "%u", &pInfo->uSpeedMbytes) == 1)
+            fclose(fp);
+        else
+        {
+            /* Failed to get speed via sysfs, go to plan B. */
+            int rc = NetIfAdpCtlOut(pszName, "info", szBuf, sizeof(szBuf));
+            if (RT_SUCCESS(rc))
+            {
+                pInfo->uSpeedMbytes = RTStrToUInt32(szBuf);
+            }
+            else
+                return rc;
+        }
     }
     return VINF_SUCCESS;

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

@@ -40 +40 @@
 
     virtual int getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle);
-    virtual int getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx, uint64_t *speed);
+    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:
@@ -218 +218 @@
 }
 
-int CollectorLinux::getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx, uint64_t *speed)
+int CollectorLinux::getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx)
 {
     int rc = VINF_SUCCESS;
@@ -242 +242 @@
                 rc = VERR_FILE_IO_ERROR;
             fclose(f);
-            RTStrPrintf(szIfName, sizeof(szIfName), "/sys/class/net/%s/speed", name);
-            f = fopen(szIfName, "r");
-            if (f)
-            {
-                if (fscanf(f, "%llu", &u64Speed) == 1)
-                    *speed = u64Speed * (1000000/8); /* Convert to bytes/sec */
-                else
-                    rc = VERR_FILE_IO_ERROR;
-                fclose(f);
-            }
-            else
-                rc = VERR_ACCESS_DENIED;
         }
         else