Index: test/cctest/test-cpu-profiler.cc |
diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc |
index ed0b190f93e8d5f27d99745eaaa6a0331479db64..9bcefa4b86b3bb67d48f2a0cd2681d2b9d8a0b85 100644 |
--- a/test/cctest/test-cpu-profiler.cc |
+++ b/test/cctest/test-cpu-profiler.cc |
@@ -355,33 +355,33 @@ TEST(DeleteCpuProfile) { |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
v8::Local<v8::String> name1 = v8::String::NewFromUtf8(env->GetIsolate(), "1"); |
- cpu_profiler->StartCpuProfiling(name1); |
- const v8::CpuProfile* p1 = cpu_profiler->StopCpuProfiling(name1); |
+ cpu_profiler->StartProfiling(name1); |
+ v8::CpuProfile* p1 = cpu_profiler->StopProfiling(name1); |
CHECK_NE(NULL, p1); |
CHECK_EQ(1, iprofiler->GetProfilesCount()); |
CHECK(FindCpuProfile(cpu_profiler, p1)); |
- const_cast<v8::CpuProfile*>(p1)->Delete(); |
+ p1->Delete(); |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
v8::Local<v8::String> name2 = v8::String::NewFromUtf8(env->GetIsolate(), "2"); |
- cpu_profiler->StartCpuProfiling(name2); |
- const v8::CpuProfile* p2 = cpu_profiler->StopCpuProfiling(name2); |
+ cpu_profiler->StartProfiling(name2); |
+ v8::CpuProfile* p2 = cpu_profiler->StopProfiling(name2); |
CHECK_NE(NULL, p2); |
CHECK_EQ(1, iprofiler->GetProfilesCount()); |
CHECK(FindCpuProfile(cpu_profiler, p2)); |
v8::Local<v8::String> name3 = v8::String::NewFromUtf8(env->GetIsolate(), "3"); |
- cpu_profiler->StartCpuProfiling(name3); |
- const v8::CpuProfile* p3 = cpu_profiler->StopCpuProfiling(name3); |
+ cpu_profiler->StartProfiling(name3); |
+ v8::CpuProfile* p3 = cpu_profiler->StopProfiling(name3); |
CHECK_NE(NULL, p3); |
CHECK_EQ(2, iprofiler->GetProfilesCount()); |
CHECK_NE(p2, p3); |
CHECK(FindCpuProfile(cpu_profiler, p3)); |
CHECK(FindCpuProfile(cpu_profiler, p2)); |
- const_cast<v8::CpuProfile*>(p2)->Delete(); |
+ p2->Delete(); |
CHECK_EQ(1, iprofiler->GetProfilesCount()); |
CHECK(!FindCpuProfile(cpu_profiler, p2)); |
CHECK(FindCpuProfile(cpu_profiler, p3)); |
- const_cast<v8::CpuProfile*>(p3)->Delete(); |
+ p3->Delete(); |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
} |
@@ -393,13 +393,13 @@ TEST(ProfileStartEndTime) { |
v8::Local<v8::String> profile_name = |
v8::String::NewFromUtf8(env->GetIsolate(), "test"); |
- cpu_profiler->StartCpuProfiling(profile_name); |
- const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name); |
+ cpu_profiler->StartProfiling(profile_name); |
+ const v8::CpuProfile* profile = cpu_profiler->StopProfiling(profile_name); |
CHECK(profile->GetStartTime() <= profile->GetEndTime()); |
} |
-static const v8::CpuProfile* RunProfiler( |
+static v8::CpuProfile* RunProfiler( |
v8::Handle<v8::Context> env, v8::Handle<v8::Function> function, |
v8::Handle<v8::Value> argv[], int argc, |
unsigned min_js_samples) { |
@@ -407,7 +407,7 @@ static const v8::CpuProfile* RunProfiler( |
v8::Local<v8::String> profile_name = |
v8::String::NewFromUtf8(env->GetIsolate(), "my_profile"); |
- cpu_profiler->StartCpuProfiling(profile_name); |
+ cpu_profiler->StartProfiling(profile_name); |
i::Sampler* sampler = |
reinterpret_cast<i::Isolate*>(env->GetIsolate())->logger()->sampler(); |
@@ -416,12 +416,11 @@ static const v8::CpuProfile* RunProfiler( |
function->Call(env->Global(), argc, argv); |
} while (sampler->js_and_external_sample_count() < min_js_samples); |
- const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name); |
+ v8::CpuProfile* profile = cpu_profiler->StopProfiling(profile_name); |
CHECK_NE(NULL, profile); |
// Dump collected profile to have a better diagnostic in case of failure. |
- reinterpret_cast<i::CpuProfile*>( |
- const_cast<v8::CpuProfile*>(profile))->Print(); |
+ reinterpret_cast<i::CpuProfile*>(profile)->Print(); |
return profile; |
} |
@@ -553,7 +552,7 @@ TEST(CollectCpuProfile) { |
v8::Handle<v8::Value> args[] = { |
v8::Integer::New(env->GetIsolate(), profiling_interval_ms) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 200); |
function->Call(env->Global(), ARRAY_SIZE(args), args); |
@@ -585,7 +584,7 @@ TEST(CollectCpuProfile) { |
CheckSimpleBranch(env->GetIsolate(), fooNode, delayBranch, |
ARRAY_SIZE(delayBranch)); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -627,7 +626,7 @@ TEST(SampleWhenFrameIsNotSetup) { |
v8::Handle<v8::Value> args[] = { |
v8::Integer::New(env->GetIsolate(), repeat_count) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 100); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -654,7 +653,7 @@ TEST(SampleWhenFrameIsNotSetup) { |
} |
} |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -747,7 +746,7 @@ TEST(NativeAccessorUninitializedIC) { |
int32_t repeat_count = 1; |
v8::Handle<v8::Value> args[] = { v8::Integer::New(isolate, repeat_count) }; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 180); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -756,7 +755,7 @@ TEST(NativeAccessorUninitializedIC) { |
GetChild(isolate, startNode, "get foo"); |
GetChild(isolate, startNode, "set foo"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -804,7 +803,7 @@ TEST(NativeAccessorMonomorphicIC) { |
int32_t repeat_count = 100; |
v8::Handle<v8::Value> args[] = { v8::Integer::New(isolate, repeat_count) }; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 200); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -813,7 +812,7 @@ TEST(NativeAccessorMonomorphicIC) { |
GetChild(isolate, startNode, "get foo"); |
GetChild(isolate, startNode, "set foo"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -858,7 +857,7 @@ TEST(NativeMethodUninitializedIC) { |
int32_t repeat_count = 1; |
v8::Handle<v8::Value> args[] = { v8::Integer::New(isolate, repeat_count) }; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 100); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -866,7 +865,7 @@ TEST(NativeMethodUninitializedIC) { |
GetChild(isolate, root, "start"); |
GetChild(isolate, startNode, "fooMethod"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -915,7 +914,7 @@ TEST(NativeMethodMonomorphicIC) { |
int32_t repeat_count = 100; |
v8::Handle<v8::Value> args[] = { v8::Integer::New(isolate, repeat_count) }; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 100); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -924,7 +923,7 @@ TEST(NativeMethodMonomorphicIC) { |
GetChild(isolate, root, "start"); |
GetChild(isolate, startNode, "fooMethod"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -956,7 +955,7 @@ TEST(BoundFunctionCall) { |
v8::Handle<v8::Value> args[] = { |
v8::Integer::New(env->GetIsolate(), duration_ms) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 100); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -973,7 +972,7 @@ TEST(BoundFunctionCall) { |
GetChild(env->GetIsolate(), root, "start"); |
GetChild(env->GetIsolate(), startNode, "foo"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -1017,7 +1016,7 @@ TEST(FunctionCallSample) { |
v8::Handle<v8::Value> args[] = { |
v8::Integer::New(env->GetIsolate(), duration_ms) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 100); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -1056,7 +1055,7 @@ TEST(FunctionCallSample) { |
CheckChildrenNames(unresolvedNode, names); |
} |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -1100,7 +1099,7 @@ TEST(FunctionApplySample) { |
v8::Integer::New(env->GetIsolate(), duration_ms) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env.local(), function, args, ARRAY_SIZE(args), 100); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -1145,7 +1144,7 @@ TEST(FunctionApplySample) { |
} |
} |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -1207,7 +1206,7 @@ TEST(JsNativeJsSample) { |
v8::Handle<v8::Value> args[] = { |
v8::Integer::New(env->GetIsolate(), duration_ms) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env, function, args, ARRAY_SIZE(args), 10); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -1234,7 +1233,7 @@ TEST(JsNativeJsSample) { |
CHECK_EQ(1, barNode->GetChildrenCount()); |
GetChild(env->GetIsolate(), barNode, "foo"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -1292,7 +1291,7 @@ TEST(JsNativeJsRuntimeJsSample) { |
v8::Handle<v8::Value> args[] = { |
v8::Integer::New(env->GetIsolate(), duration_ms) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env, function, args, ARRAY_SIZE(args), 10); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -1317,7 +1316,7 @@ TEST(JsNativeJsRuntimeJsSample) { |
CHECK_EQ(1, barNode->GetChildrenCount()); |
GetChild(env->GetIsolate(), barNode, "foo"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -1386,7 +1385,7 @@ TEST(JsNative1JsNative2JsSample) { |
v8::Handle<v8::Value> args[] = { |
v8::Integer::New(env->GetIsolate(), duration_ms) |
}; |
- const v8::CpuProfile* profile = |
+ v8::CpuProfile* profile = |
RunProfiler(env, function, args, ARRAY_SIZE(args), 10); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
@@ -1415,7 +1414,7 @@ TEST(JsNative1JsNative2JsSample) { |
CHECK_EQ(1, nativeNode2->GetChildrenCount()); |
GetChild(env->GetIsolate(), nativeNode2, "foo"); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -1430,7 +1429,7 @@ TEST(IdleTime) { |
v8::Local<v8::String> profile_name = |
v8::String::NewFromUtf8(env->GetIsolate(), "my_profile"); |
- cpu_profiler->StartCpuProfiling(profile_name); |
+ cpu_profiler->StartProfiling(profile_name); |
i::Isolate* isolate = CcTest::i_isolate(); |
i::ProfilerEventsProcessor* processor = isolate->cpu_profiler()->processor(); |
@@ -1446,11 +1445,10 @@ TEST(IdleTime) { |
processor->AddCurrentStack(isolate); |
- const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name); |
+ v8::CpuProfile* profile = cpu_profiler->StopProfiling(profile_name); |
CHECK_NE(NULL, profile); |
// Dump collected profile to have a better diagnostic in case of failure. |
- reinterpret_cast<i::CpuProfile*>( |
- const_cast<v8::CpuProfile*>(profile))->Print(); |
+ reinterpret_cast<i::CpuProfile*>(profile)->Print(); |
const v8::CpuProfileNode* root = profile->GetTopDownRoot(); |
ScopedVector<v8::Handle<v8::String> > names(3); |
@@ -1472,7 +1470,7 @@ TEST(IdleTime) { |
CHECK_EQ(0, idleNode->GetChildrenCount()); |
CHECK_GE(idleNode->GetHitCount(), 3); |
- const_cast<v8::CpuProfile*>(profile)->Delete(); |
+ profile->Delete(); |
} |
@@ -1545,24 +1543,24 @@ TEST(DontStopOnFinishedProfileDelete) { |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
v8::Handle<v8::String> outer = v8::String::NewFromUtf8(isolate, "outer"); |
- profiler->StartCpuProfiling(outer); |
+ profiler->StartProfiling(outer); |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
v8::Handle<v8::String> inner = v8::String::NewFromUtf8(isolate, "inner"); |
- profiler->StartCpuProfiling(inner); |
+ profiler->StartProfiling(inner); |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
- const v8::CpuProfile* inner_profile = profiler->StopCpuProfiling(inner); |
+ v8::CpuProfile* inner_profile = profiler->StopProfiling(inner); |
CHECK(inner_profile); |
CHECK_EQ(1, iprofiler->GetProfilesCount()); |
- const_cast<v8::CpuProfile*>(inner_profile)->Delete(); |
+ inner_profile->Delete(); |
inner_profile = NULL; |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
- const v8::CpuProfile* outer_profile = profiler->StopCpuProfiling(outer); |
+ v8::CpuProfile* outer_profile = profiler->StopProfiling(outer); |
CHECK(outer_profile); |
CHECK_EQ(1, iprofiler->GetProfilesCount()); |
- const_cast<v8::CpuProfile*>(outer_profile)->Delete(); |
+ outer_profile->Delete(); |
outer_profile = NULL; |
CHECK_EQ(0, iprofiler->GetProfilesCount()); |
} |