vbox的更動 44450 路徑 trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

時間撮記:

2013-1-30 上午07:19:06 (12 年 以前)

作者:

vboxsync

訊息:

Main/Metrics: Adjust per-VM CPU load by number of cores on Solaris (#6345)

檔案:

• trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp (修改) (5 筆差異)

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

@@ -100 +100 @@
 
     FsMap             mFsMap;
+    uint32_t          mCpus;
 };
 
@@ -114 +115 @@
       mSysPages(0),
       mZFSCache(0),
-      mZfsLib(0)
+      mZfsLib(0),
+      mCpus(0)
 {
     if ((mKC = kstat_open()) == 0)
@@ -155 +157 @@
 
     updateFilesystemMap();
+    /* Notice that mCpus member will be initialized by HostCpuLoadRaw::init() */
 }
 
@@ -196 +199 @@
         return VERR_INTERNAL_ERROR;
     }
+    else
+        mCpus = cpus;
 
     if (user)   *user   = tmpUser;
@@ -221 +226 @@
             //Assert((pid_t)process == pstatus.pr_pid);
             //Log(("user=%u kernel=%u total=%u\n", prusage.pr_utime.tv_sec, prusage.pr_stime.tv_sec, prusage.pr_tstamp.tv_sec));
-            *user = (uint64_t)prusage.pr_utime.tv_sec * 1000000000 + prusage.pr_utime.tv_nsec;
-            *kernel = (uint64_t)prusage.pr_stime.tv_sec * 1000000000 + prusage.pr_stime.tv_nsec;
+            /*
+             * The CPU time spent must be adjusted by the number of cores for compatibility with
+             * other platforms (see @bugref{6345}).
+             */
+            Assert(mCpus);
+            if (mCpus)
+            {
+                *user = ((uint64_t)prusage.pr_utime.tv_sec * 1000000000 + prusage.pr_utime.tv_nsec) / mCpus;
+                *kernel = ((uint64_t)prusage.pr_stime.tv_sec * 1000000000 + prusage.pr_stime.tv_nsec) / mCpus;
+            }
+            else
+                *user = *kernel = 0;
             *total = (uint64_t)prusage.pr_tstamp.tv_sec * 1000000000 + prusage.pr_tstamp.tv_nsec;
             //Log(("user=%llu kernel=%llu total=%llu\n", *user, *kernel, *total));