Changeset 43840 in vbox for trunk

Timestamp:

Nov 8, 2012 1:33:23 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Fix volume name extraction in Linux (#6345)

File:

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

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

@@ -60 +60 @@
     virtual int _getRawHostCpuLoad();
     int getRawProcessStats(RTPROCESS process, uint64_t *cpuUser, uint64_t *cpuKernel, ULONG *memPagesUsed);
+    char *getDiskName(char *pszDiskName, size_t cbDiskName, const char *pszDevName, bool fTrimDigits);
+    void addVolumeDependencies(const char *pcszVolume, DiskList& listDisks);
 
     struct VMProcessStats
@@ -354 +356 @@
 }
 
-static char *getDiskName(char *pszDiskName, size_t cbDiskName, const char *pszDevName)
+char *CollectorLinux::getDiskName(char *pszDiskName, size_t cbDiskName, const char *pszDevName, bool fTrimDigits)
 {
     unsigned cbName = 0;
     unsigned cbDevName = strlen(pszDevName);
     const char *pszEnd = pszDevName + cbDevName - 1;
-    while (pszEnd > pszDevName && RT_C_IS_DIGIT(*pszEnd))
-        pszEnd--;
+    if (fTrimDigits)
+        while (pszEnd > pszDevName && RT_C_IS_DIGIT(*pszEnd))
+            pszEnd--;
     while (pszEnd > pszDevName && *pszEnd != '/')
     {
@@ -370 +373 @@
 }
 
-static void addVolumeDependencies(const char *pcszVolume, DiskList& listDisks)
+void CollectorLinux::addVolumeDependencies(const char *pcszVolume, DiskList& listDisks)
 {
     char szVolInfo[RTPATH_MAX];
@@ -407 +410 @@
             {
                 char szDevName[128];
-                getDiskName(szDevName, sizeof(szDevName), mntent->mnt_fsname);
                 if (strncmp(mntent->mnt_fsname, "/dev/mapper", 11))
+                {
+                    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);
+                }
                 break;
             }