Changeset 43835 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 8, 2012 6:43:02 AM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Fix for UFS (#6345)

Location:

trunk/src/VBox/Main

Files:

• src-server/solaris/PerformanceSolaris.cpp (modified) (4 diffs)
• testcase/tstCollector.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -79 +79 @@
     void updateFilesystemMap(void);
     RTCString physToInstName(const char *pcszPhysName);
+    RTCString pathToInstName(const char *pcszDevPathName);
 
     kstat_ctl_t *mKC;
@@ -539 +540 @@
 }
 
+RTCString CollectorSolaris::pathToInstName(const char *pcszDevPathName)
+{
+    char szLink[RTPATH_MAX];
+    if (readlink(pcszDevPathName, szLink, sizeof(szLink)) != -1)
+    {
+        char *pszStart, *pszEnd;
+        pszStart = strstr(szLink, "/devices/");
+        pszEnd = strrchr(szLink, ':');
+        if (pszStart && pszEnd)
+        {
+            pszStart += 8; // Skip "/devices"
+            *pszEnd = '\0'; // Trim partition
+            return physToInstName(pszStart);
+        }
+    }
+
+    return RTCString(pcszDevPathName);
+}
+
 int CollectorSolaris::getDiskListByFs(const char *name, DiskList& list)
 {
@@ -546 +566 @@
 
     RTCString strName = it->second.substr(0, it->second.find("/"));
-    if (mZpoolOpen && mZpoolClose && mZpoolGetConfig)
+    if (mZpoolOpen && mZpoolClose && mZpoolGetConfig && !strName.isEmpty())
     {
         zpool_handle_t *zh = mZpoolOpen(mZfsLib, strName.c_str());
@@ -591 +611 @@
     }
     else
-        list.push_back(RTCString(name));
+        list.push_back(pathToInstName(it->second.c_str()));
     return VINF_SUCCESS;
 }

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

@@ -246 +246 @@
     if (RT_FAILURE(rc))
     {
-        RTPrintf("tstCollector: getRawHostNetworkLoad() -> %Rrc\n", rc);
+        RTPrintf("tstCollector: getRawHostDiskLoad() -> %Rrc\n", rc);
         return 1;
     }
@@ -261 +261 @@
     if (RT_FAILURE(rc))
     {
-        RTPrintf("tstCollector: getRawHostNetworkLoad() -> %Rrc\n", rc);
+        RTPrintf("tstCollector: getRawHostDiskLoad() -> %Rrc\n", rc);
         return 1;
     }