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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84307

Message:

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

File:

• trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp (modified) (4 diffs)

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

@@ -74 +74 @@
     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:
     static uint32_t getInstance(const char *pszIfaceName, char *pszDevName);
@@ -665 +665 @@
 }
 
-int CollectorSolaris::getDiskListByFs(const char *name, DiskList& list)
+int CollectorSolaris::getDiskListByFs(const char *name, DiskList& listUsage, DiskList& listLoad)
 {
     FsMap::iterator it = mFsMap.find(name);
@@ -708 +708 @@
                                 pszStart += 8; // Skip "/devices"
                                 *pszEnd = '\0'; // Trim partition
-                                list.push_back(physToInstName(pszStart));
+                                listUsage.push_back(physToInstName(pszStart));
                             }
                         }
@@ -719 +719 @@
     }
     else
-        list.push_back(pathToInstName(it->second.c_str()));
+        listUsage.push_back(pathToInstName(it->second.c_str()));
+    listLoad = listUsage;
     return VINF_SUCCESS;
 }