diff options
| author | palange@pdp47.lindenlab.com <palange@pdp47.lindenlab.com> | 2010-06-02 15:24:59 -0700 |
|---|---|---|
| committer | palange@pdp47.lindenlab.com <palange@pdp47.lindenlab.com> | 2010-06-02 15:24:59 -0700 |
| commit | 71f39136795609700a6eb46aad7b0f1397a860d0 (patch) | |
| tree | 678315ab934a55b7d432bc22af7b68088d3ae88b /indra/llcommon/llprocessor.cpp | |
| parent | 8b9a0a9576ba4002208f56373443701944027c0c (diff) | |
EXT-3780 FIX Fixed CPU MHz to be MHz on all platforms.
Diffstat (limited to 'indra/llcommon/llprocessor.cpp')
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 44a8c8d059..98c9eabcd6 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -289,7 +289,7 @@ public: out << "// CPU General Information" << std::endl; out << "//////////////////////////" << std::endl; out << "Processor Name: " << getCPUBrandName() << std::endl; - out << "Frequency: " << getCPUFrequency() / (F64)1000000 << " MHz" << std::endl; + out << "Frequency: " << getCPUFrequency() << " MHz" << std::endl; out << "Vendor: " << getInfo(eVendor, "Unknown").asString() << std::endl; out << "Family: " << getCPUFamilyName() << " (" << getInfo(eFamily, 0) << ")" << std::endl; out << "Extended family: " << getInfo(eExtendedFamily, 0) << std::endl; @@ -460,8 +460,8 @@ static F64 calculate_cpu_frequency(U32 measure_msecs) F64 frequency = (F64)dif / (((F64)timedif) / freq); // At last we just return the frequency that is also stored in the call - // member var uqwFrequency - return frequency; + // member var uqwFrequency - converted to MHz + return frequency / (F64)1000000; } // Windows implementation @@ -596,7 +596,7 @@ public: { getCPUIDInfo(); uint64_t frequency = getSysctlInt64("hw.cpufrequency"); - setInfo(eFrequency, (F64)frequency); + setInfo(eFrequency, (F64)frequency / (F64)1000000); } virtual ~LLProcessorInfoDarwinImpl() {} |