ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
77 lines
2.3 KiB
C++
77 lines
2.3 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "BenchSysTimer_mach.h"
|
|
|
|
//Time
|
|
#include <mach/mach.h>
|
|
#include <mach/mach_time.h>
|
|
|
|
static time_value_t macCpuTime() {
|
|
mach_port_t task = mach_task_self();
|
|
if (task == MACH_PORT_NULL) {
|
|
time_value_t none = {0, 0};
|
|
return none;
|
|
}
|
|
|
|
task_thread_times_info thread_info_data;
|
|
mach_msg_type_number_t thread_info_count = TASK_THREAD_TIMES_INFO_COUNT;
|
|
if (KERN_SUCCESS != task_info(task,
|
|
TASK_THREAD_TIMES_INFO,
|
|
reinterpret_cast<task_info_t>(&thread_info_data),
|
|
&thread_info_count))
|
|
{
|
|
time_value_t none = {0, 0};
|
|
return none;
|
|
}
|
|
|
|
time_value_add(&thread_info_data.user_time, &thread_info_data.system_time)
|
|
return thread_info_data.user_time;
|
|
}
|
|
|
|
static double intervalInMSec(const time_value_t start_clock
|
|
, const time_value_t end_clock)
|
|
{
|
|
double duration_clock;
|
|
if ((end_clock.microseconds - start_clock.microseconds) < 0) {
|
|
duration_clock = (end_clock.seconds - start_clock.seconds-1)*1000;
|
|
duration_clock += (1000000
|
|
+ end_clock.microseconds
|
|
- start_clock.microseconds) / 1000.0;
|
|
} else {
|
|
duration_clock = (end_clock.seconds - start_clock.seconds)*1000;
|
|
duration_clock += (end_clock.microseconds - start_clock.microseconds)
|
|
/ 1000.0;
|
|
}
|
|
return duration_clock;
|
|
}
|
|
|
|
void BenchSysTimer::startWall() {
|
|
this->fStartWall = mach_absolute_time();
|
|
}
|
|
void BenchSysTimer::startCpu() {
|
|
this->fStartCpu = macCpuTime();
|
|
}
|
|
|
|
double BenchSysTimer::endCpu() {
|
|
time_value_t end_cpu = macCpuTime();
|
|
return intervalInMSec(this->fStartCpu, end_cpu);
|
|
}
|
|
double BenchSysTimer::endWall() {
|
|
uint64_t end_wall = mach_absolute_time();
|
|
|
|
uint64_t elapsed = end_wall - this->fStartWall;
|
|
mach_timebase_info_data_t sTimebaseInfo;
|
|
if (KERN_SUCCESS != mach_timebase_info(&sTimebaseInfo)) {
|
|
return 0;
|
|
} else {
|
|
uint64_t elapsedNano = elapsed * sTimebaseInfo.numer
|
|
/ sTimebaseInfo.denom;
|
|
return elapsedNano / 1000000;
|
|
}
|
|
}
|