vbox的更動 10446 路徑 trunk/src/VBox/Runtime/r3/linux/mp-linux.cpp

時間撮記:

2008-7-9 下午06:39:22 (16 年 以前)

作者:

vboxsync

訊息:

Adjusted cpu frequency logic a bit. Make more generous assumptions about cur frequency, and be more strict with max frequency.

檔案:

• trunk/src/VBox/Runtime/r3/linux/mp-linux.cpp (修改) (2 筆差異)

trunk/src/VBox/Runtime/r3/linux/mp-linux.cpp

@@ -373 +373 @@
     if (kHz == -1)
     {
-        if (rtLinuxSysFsExists("devices/system/cpu/cpu%d/cpufreq/cpuinfo_cur_freq", (int)idCpu))
+        /* The file may be just unreadable - in that case use plan B, i.e.
+         * /proc/cpuinfo to get the data we want. The assumption is that if
+         * cpuinfo_cur_freq doesn't exist then the speed won't change, and
+         * thus cur == max. If it does exist then cpuinfo contains the
+         * current frequency. */
+        kHz = rtMpLinuxGetFrequency(idCpu) * 1000;
+    }
+    return (kHz + 999) / 1000;
+}
+
+
+RTDECL(uint32_t) RTMpGetMaxFrequency(RTCPUID idCpu)
+{
+    int64_t kHz = rtLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", (int)idCpu);
+    if (kHz == -1)
+    {
+        /* Check if the file isn't there - if it is there, then /proc/cpuinfo
+         * would provide current frequency information, which is wrong. */
+        if (!rtLinuxSysFsExists("devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", (int)idCpu))
             kHz = rtMpLinuxGetFrequency(idCpu) * 1000;
         else
@@ -380 +398 @@
     return (kHz + 999) / 1000;
 }
-
-
-RTDECL(uint32_t) RTMpGetMaxFrequency(RTCPUID idCpu)
-{
-    int64_t kHz = rtLinuxSysFsReadIntFile(0, "devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", (int)idCpu);
-    if (kHz == -1)
-        kHz = rtMpLinuxGetFrequency(idCpu) * 1000;
-    return (kHz + 999) / 1000;
-}