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

Timestamp:

Mar 15, 2013 3:34:54 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: handle less common cases for FS to disk resolution (#6345)

File:

• trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp (modified) (7 diffs)

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

@@ -57 +57 @@
     virtual int getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total);
 
-    virtual int getDiskListByFs(const char *name, DiskList& list);
+    virtual int getDiskListByFs(const char *name, DiskList& listUsage, DiskList& listLoad);
 private:
     virtual int _getRawHostCpuLoad();
@@ -63 +63 @@
     char *getDiskName(char *pszDiskName, size_t cbDiskName, const char *pszDevName, bool fTrimDigits);
     void addVolumeDependencies(const char *pcszVolume, DiskList& listDisks);
+    void addRaidDisks(const char *pcszDevice, DiskList& listDisks);
     char *trimTrailingDigits(char *pszName);
+    char *trimNewline(char *pszName);
 
     struct VMProcessStats
@@ -425 +427 @@
 }
 
+char *CollectorLinux::trimNewline(char *pszName)
+{
+    unsigned cbName = strlen(pszName);
+    if (cbName == 0)
+        return pszName;
+
+    char *pszEnd = pszName + cbName - 1;
+    while (pszEnd > pszName && *pszEnd == '\n')
+        pszEnd--;
+    pszEnd[1] = '\0';
+
+    return pszName;
+}
+
 char *CollectorLinux::trimTrailingDigits(char *pszName)
 {
@@ -456 +472 @@
 }
 
+void CollectorLinux::addRaidDisks(const char *pcszDevice, DiskList& listDisks)
+{
+    FILE *f = fopen("/proc/mdstat", "r");
+    if (f)
+    {
+        char szBuf[128];
+        while (fgets(szBuf, sizeof(szBuf), f))
+        {
+            char *pszBufName = szBuf;
+
+            char *pszBufData = strchr(pszBufName, ' ');
+            if (!pszBufData)
+            {
+                LogRel(("CollectorLinux::addRaidDisks() failed to parse disk stats: %s\n", szBuf));
+                continue;
+            }
+            *pszBufData++ = '\0';
+            if (!strcmp(pcszDevice, pszBufName))
+            {
+                while (*pszBufData == ':')         ++pszBufData; /* Skip delimiter */
+                while (*pszBufData == ' ')         ++pszBufData; /* Skip spaces */
+                while (RT_C_IS_ALNUM(*pszBufData)) ++pszBufData; /* Skip status */
+                while (*pszBufData == ' ')         ++pszBufData; /* Skip spaces */
+                while (RT_C_IS_ALNUM(*pszBufData)) ++pszBufData; /* Skip type */
+
+                while (*pszBufData != '\0')
+                {
+                    while (*pszBufData == ' ') ++pszBufData; /* Skip spaces */
+                    char *pszDisk = pszBufData;
+                    while (RT_C_IS_ALPHA(*pszBufData))
+                        ++pszBufData;
+                    if (*pszBufData)
+                    {
+                        *pszBufData++ = '\0';
+                        listDisks.push_back(RTCString(pszDisk));
+                        while (*pszBufData != '\0' && *pszBufData != ' ')
+                            ++pszBufData;
+                    }
+                    else
+                        listDisks.push_back(RTCString(pszDisk));
+                }
+                break;
+            }
+        }
+        fclose(f);
+    }
+}
+
 void CollectorLinux::addVolumeDependencies(const char *pcszVolume, DiskList& listDisks)
 {
@@ -474 +538 @@
 
         while (fgets(szBuf, sizeof(szBuf), fp))
-            listDisks.push_back(RTCString(trimTrailingDigits(szBuf)));
+            if (strncmp(szBuf, "dm-", 3))
+                listDisks.push_back(RTCString(trimTrailingDigits(szBuf)));
+            else
+                listDisks.push_back(RTCString(trimNewline(szBuf)));
 
         pclose(fp);
@@ -482 +549 @@
 }
 
-int CollectorLinux::getDiskListByFs(const char *pszPath, DiskList& listDisks)
+int CollectorLinux::getDiskListByFs(const char *pszPath, DiskList& listUsage, DiskList& listLoad)
 {
     FILE *mtab = setmntent("/etc/mtab", "r");
@@ -490 +557 @@
         while ((mntent = getmntent(mtab)))
         {
+            /* Skip rootfs entry, there must be another root mount. */
+            if (strcmp(mntent->mnt_fsname, "rootfs") == 0)
+                continue;
             if (strcmp(pszPath, mntent->mnt_dir) == 0)
             {
                 char szDevName[128];
-                if (strncmp(mntent->mnt_fsname, "/dev/mapper", 11))
-                {
+                char szFsName[1024];
+                /* Try to resolve symbolic link if necessary */
+                ssize_t cbFsName = readlink(mntent->mnt_fsname, szFsName, sizeof(szFsName) - 1);
+                if (cbFsName != -1)
+                    szFsName[cbFsName] = '\0';
+                else
+                    strcpy(szFsName, mntent->mnt_fsname);
+                if (!strncmp(szFsName, "/dev/mapper", 11))
+                {
+                    /* LVM */
+                    getDiskName(szDevName, sizeof(szDevName), szFsName, false);
+                    addVolumeDependencies(szDevName, listUsage);
+                    listLoad = listUsage;
+                }
+                else if (!strncmp(szFsName, "/dev/md", 7))
+                {
+                    /* Software RAID */
+                    getDiskName(szDevName, sizeof(szDevName), szFsName, false);
+                    listUsage.push_back(RTCString(szDevName));
+                    addRaidDisks(szDevName, listLoad);
+                }
+                else
+                {
+                    /* Plain disk partition */
                     getDiskName(szDevName, sizeof(szDevName), mntent->mnt_fsname, true);
-                    listDisks.push_back(RTCString(szDevName));
-                }
-                else
-                {
-                    getDiskName(szDevName, sizeof(szDevName), mntent->mnt_fsname, false);
-                    addVolumeDependencies(szDevName, listDisks);
+                    listUsage.push_back(RTCString(szDevName));
+                    listLoad.push_back(RTCString(szDevName));
+                }
+                if (listUsage.empty() || listLoad.empty())
+                {
+                    LogRel(("Failed to retrive disk info: getDiskName(%s) --> %s\n", mntent->mnt_fsname, szDevName));
                 }
                 break;