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

Timestamp:

Oct 24, 2012 8:32:14 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: devmapper support 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

@@ -28 +28 @@
 #include <iprt/err.h>
 #include <iprt/param.h>
+#include <iprt/path.h>
 #include <iprt/string.h>
 #include <iprt/mp.h>
@@ -36 +37 @@
 #include "Logging.h"
 #include "Performance.h"
+
+#define VBOXVOLINFO_NAME "VBoxVolInfo"
 
 namespace pm {
@@ -365 +368 @@
 }
 
+static void addVolumeDependencies(const char *pcszVolume, DiskList& listDisks)
+{
+    char szVolInfo[RTPATH_MAX];
+    int rc = RTPathExecDir(szVolInfo, sizeof(szVolInfo) - sizeof("/" VBOXVOLINFO_NAME " ") - strlen(pcszVolume));
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("VolInfo: Failed to get program path, rc=%Rrc\n", rc));
+        return VERR_INVALID_PARAMETER;
+    }
+    strcat(szVolInfo, "/" VBOXVOLINFO_NAME " ");
+    strcat(szVolInfo, pcszVolume);
+
+    FILE *fp = popen(szVolInfo, "r");
+    if (fp)
+    {
+        char szBuf[128];
+
+        while (fgets(szBuf, sizeof(szBuf), fp))
+            listDisks.push_back(RTCString(szBuf));
+
+        pclose(fp);
+    }
+    else
+        listDisks.push_back(RTCString(pcszVolume));
+}
 
 int getDiskListByFs(const char *pszPath, DiskList& listDisks)
@@ -376 +404 @@
             if (strcmp(pszPath, mntent->mnt_dir) == 0)
             {
-                char szDevName[32];
-                listDisks.push_back(RTCString(getDiskName(szDevName, sizeof(szDevName), mntent->mnt_fsname)));
+                char szDevName[128];
+                getDiskName(szDevName, sizeof(szDevName), mntent->mnt_fsname);
+                if (strncmp(mntent->mnt_fsname, "/dev/mapper", 11))
+                    listDisks.push_back(RTCString(szDevName));
+                else
+                    addVolumeDependencies(szDevName, listDisks);
                 break;
             }