Changeset 43842 in vbox for trunk

Timestamp:

Nov 8, 2012 4:51:46 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Alternative way to collect disk stats on Linux (#6345)

Location:

trunk/src/VBox/Main

Files:

• src-server/linux/PerformanceLinux.cpp (modified) (5 diffs)
• testcase/tstCollector.cpp (modified) (2 diffs)

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

@@ -62 +62 @@
     char *getDiskName(char *pszDiskName, size_t cbDiskName, const char *pszDevName, bool fTrimDigits);
     void addVolumeDependencies(const char *pcszVolume, DiskList& listDisks);
+    char *trimTrailingDigits(char *pszName);
 
     struct VMProcessStats
@@ -332 +333 @@
 int CollectorLinux::getRawHostDiskLoad(const char *name, uint64_t *disk_ms, uint64_t *total_ms)
 {
+#if 0
     int rc = VINF_SUCCESS;
     char szIfName[/*IFNAMSIZ*/ 16 + 36];
@@ -352 +354 @@
     else
         rc = VERR_ACCESS_DENIED;
+#else
+    int rc = VERR_MISSING;
+    FILE *f = fopen("/proc/diskstats", "r");
+    if (f)
+    {
+        char szBuf[128];
+        while (fgets(szBuf, sizeof(szBuf), f))
+        {
+            char *pszBufName = &szBuf[13];
+            char *pszBufData = strchr(pszBufName, ' ');
+            if (!pszBufData)
+            {
+                LogRel(("CollectorLinux::getRawHostDiskLoad() failed to parse disk stats: %s\n", szBuf));
+                continue;
+            }
+            *pszBufData++ = '\0';
+            if (!strcmp(name, pszBufName))
+            {
+                long long unsigned int u64Busy, tmp;
+
+                if (sscanf(pszBufData, "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu",
+                           &tmp, &tmp, &tmp, &tmp, &tmp, &tmp, &tmp, &tmp, &tmp, &u64Busy, &tmp) == 11)
+                {
+                    *disk_ms   = u64Busy;
+                    *total_ms  = (uint64_t)(mSingleUser + mSingleKernel + mSingleIdle) * 1000 / mHZ;
+                    rc = VINF_SUCCESS;
+                }
+                else
+                    rc = VERR_FILE_IO_ERROR;
+                break;
+            }
+        }
+        fclose(f);
+    }
+#endif
 
     return rc;
+}
+
+char *CollectorLinux::trimTrailingDigits(char *pszName)
+{
+    unsigned cbName = strlen(pszName);
+    if (cbName == 0)
+        return pszName;
+
+    char *pszEnd = pszName + cbName - 1;
+    while (pszEnd > pszName && RT_C_IS_DIGIT(*pszEnd))
+        pszEnd--;
+    pszEnd[1] = '\0';
+
+    return pszName;
 }
 
@@ -380 +431 @@
     {
         LogRel(("VolInfo: Failed to get program path, rc=%Rrc\n", rc));
-        return VERR_INVALID_PARAMETER;
+        return;
     }
     strcat(szVolInfo, "/" VBOXVOLINFO_NAME " ");
@@ -391 +442 @@
 
         while (fgets(szBuf, sizeof(szBuf), fp))
-            listDisks.push_back(RTCString(szBuf));
+            listDisks.push_back(RTCString(trimTrailingDigits(szBuf)));
 
         pclose(fp);

trunk/src/VBox/Main/testcase/tstCollector.cpp

@@ -314 +314 @@
         return 1;
     }
-#if 1
+#if 0
     pm::CollectorHints hints;
     hints.collectHostCpuLoad();
@@ -482 +482 @@
     rc = testDisk(collector);
 #endif
-#if 1
+#if 0
     RTPrintf("tstCollector: TESTING - Performance\n\n");