diff options
Diffstat (limited to 'system_wrappers/source/cpu_mac.cc')
| -rw-r--r-- | system_wrappers/source/cpu_mac.cc | 199 |
1 files changed, 93 insertions, 106 deletions
diff --git a/system_wrappers/source/cpu_mac.cc b/system_wrappers/source/cpu_mac.cc index d82bf07d..03428022 100644 --- a/system_wrappers/source/cpu_mac.cc +++ b/system_wrappers/source/cpu_mac.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "cpu_mac.h" +#include "system_wrappers/source/cpu_mac.h" #include <iostream> #include <mach/mach.h> @@ -17,127 +17,114 @@ #include "tick_util.h" namespace webrtc { + CpuWrapperMac::CpuWrapperMac() - : _cpuCount(0), - _cpuUsage(NULL), - _totalCpuUsage(0), - _lastTickCount(NULL), - _lastTime(0) -{ - natural_t cpuCount; - processor_info_array_t infoArray; - mach_msg_type_number_t infoCount; - - kern_return_t error = host_processor_info(mach_host_self(), - PROCESSOR_CPU_LOAD_INFO, - &cpuCount, - &infoArray, - &infoCount); - if (error) - { - return; - } + : cpu_count_(0), + cpu_usage_(NULL), + total_cpu_usage_(0), + last_tick_count_(NULL), + last_time_(0) { + natural_t cpu_count; + processor_info_array_t info_array; + mach_msg_type_number_t info_count; + + kern_return_t error = host_processor_info(mach_host_self(), + PROCESSOR_CPU_LOAD_INFO, + &cpu_count, + &info_array, + &info_count); + if (error) { + return; + } - _cpuCount = cpuCount; - _cpuUsage = new WebRtc_UWord32[cpuCount]; - _lastTickCount = new WebRtc_Word64[cpuCount]; - _lastTime = TickTime::MillisecondTimestamp(); - - processor_cpu_load_info_data_t* cpuLoadInfo = - (processor_cpu_load_info_data_t*) infoArray; - for (unsigned int cpu= 0; cpu < cpuCount; cpu++) - { - WebRtc_Word64 ticks = 0; - for (int state = 0; state < 2; state++) - { - ticks += cpuLoadInfo[cpu].cpu_ticks[state]; - } - _lastTickCount[cpu] = ticks; - _cpuUsage[cpu] = 0; + cpu_count_ = cpu_count; + cpu_usage_ = new WebRtc_UWord32[cpu_count]; + last_tick_count_ = new WebRtc_Word64[cpu_count]; + last_time_ = TickTime::MillisecondTimestamp(); + + processor_cpu_load_info_data_t* cpu_load_info = + (processor_cpu_load_info_data_t*) info_array; + for (unsigned int cpu = 0; cpu < cpu_count; ++cpu) { + WebRtc_Word64 ticks = 0; + for (int state = 0; state < 2; ++state) { + ticks += cpu_load_info[cpu].cpu_ticks[state]; } - vm_deallocate(mach_task_self(), (vm_address_t)infoArray, infoCount); + last_tick_count_[cpu] = ticks; + cpu_usage_[cpu] = 0; + } + vm_deallocate(mach_task_self(), (vm_address_t)info_array, info_count); } -CpuWrapperMac::~CpuWrapperMac() -{ - delete[] _cpuUsage; - delete[] _lastTickCount; +CpuWrapperMac::~CpuWrapperMac() { + delete[] cpu_usage_; + delete[] last_tick_count_; } -WebRtc_Word32 CpuWrapperMac::CpuUsage() -{ - WebRtc_UWord32 numCores; - WebRtc_UWord32* array = NULL; - return CpuUsageMultiCore(numCores, array); +WebRtc_Word32 CpuWrapperMac::CpuUsage() { + WebRtc_UWord32 num_cores; + WebRtc_UWord32* array = NULL; + return CpuUsageMultiCore(num_cores, array); } WebRtc_Word32 -CpuWrapperMac::CpuUsageMultiCore(WebRtc_UWord32& numCores, - WebRtc_UWord32*& array) -{ - // sanity check - if(_cpuUsage == NULL) - { - return -1; - } - - WebRtc_Word64 now = TickTime::MillisecondTimestamp(); - WebRtc_Word64 timeDiffMS = now - _lastTime; - if(timeDiffMS >= 500) - { - if(Update(timeDiffMS) != 0) - { - return -1; - } - _lastTime = now; +CpuWrapperMac::CpuUsageMultiCore(WebRtc_UWord32& num_cores, + WebRtc_UWord32*& array) { + // sanity check + if (cpu_usage_ == NULL) { + return -1; + } + + WebRtc_Word64 now = TickTime::MillisecondTimestamp(); + WebRtc_Word64 time_diff_ms = now - last_time_; + if (time_diff_ms >= 500) { + if (Update(time_diff_ms) != 0) { + return -1; } - - numCores = _cpuCount; - array = _cpuUsage; - return _totalCpuUsage / _cpuCount; + last_time_ = now; + } + + num_cores = cpu_count_; + array = cpu_usage_; + return total_cpu_usage_ / cpu_count_; } -WebRtc_Word32 CpuWrapperMac::Update(WebRtc_Word64 timeDiffMS) -{ - natural_t cpuCount; - processor_info_array_t infoArray; - mach_msg_type_number_t infoCount; - - kern_return_t error = host_processor_info(mach_host_self(), - PROCESSOR_CPU_LOAD_INFO, - &cpuCount, - &infoArray, - &infoCount); - if (error) - { - return -1; - } +WebRtc_Word32 CpuWrapperMac::Update(WebRtc_Word64 time_diff_ms) { + natural_t cpu_count; + processor_info_array_t info_array; + mach_msg_type_number_t info_count; + + kern_return_t error = host_processor_info(mach_host_self(), + PROCESSOR_CPU_LOAD_INFO, + &cpu_count, + &info_array, + &info_count); + if (error) { + return -1; + } - processor_cpu_load_info_data_t* cpuLoadInfo = - (processor_cpu_load_info_data_t*) infoArray; - - _totalCpuUsage = 0; - for (unsigned int cpu = 0; cpu < cpuCount; cpu++) - { - WebRtc_Word64 ticks = 0; - for (int state = 0; state < 2; state++) - { - ticks += cpuLoadInfo[cpu].cpu_ticks[state]; - } - if(timeDiffMS <= 0) - { - _cpuUsage[cpu] = 0; - }else { - _cpuUsage[cpu] = (WebRtc_UWord32)((1000 * - (ticks - _lastTickCount[cpu])) / - timeDiffMS); - } - _lastTickCount[cpu] = ticks; - _totalCpuUsage += _cpuUsage[cpu]; + processor_cpu_load_info_data_t* cpu_load_info = + (processor_cpu_load_info_data_t*) info_array; + + total_cpu_usage_ = 0; + for (unsigned int cpu = 0; cpu < cpu_count; ++cpu) { + WebRtc_Word64 ticks = 0; + for (int state = 0; state < 2; ++state) { + ticks += cpu_load_info[cpu].cpu_ticks[state]; + } + if (time_diff_ms <= 0) { + cpu_usage_[cpu] = 0; + } else { + cpu_usage_[cpu] = (WebRtc_UWord32)((1000 * + (ticks - last_tick_count_[cpu])) / + time_diff_ms); } + last_tick_count_[cpu] = ticks; + total_cpu_usage_ += cpu_usage_[cpu]; + } - vm_deallocate(mach_task_self(), (vm_address_t)infoArray, infoCount); + vm_deallocate(mach_task_self(), (vm_address_t)info_array, info_count); - return 0; + return 0; } + } // namespace webrtc |