| Index: test/cctest/test-cpu-profiler.cc
|
| diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc
|
| index e59687b215cb30954024ef847020f1fc2cda5c30..87f1147f13b57def3779ec33c878ad2c6bec265a 100644
|
| --- a/test/cctest/test-cpu-profiler.cc
|
| +++ b/test/cctest/test-cpu-profiler.cc
|
| @@ -44,7 +44,6 @@ using i::ProfileGenerator;
|
| using i::ProfileNode;
|
| using i::ProfilerEventsProcessor;
|
| using i::ScopedVector;
|
| -using i::TokenEnumerator;
|
| using i::Vector;
|
|
|
|
|
| @@ -223,8 +222,7 @@ TEST(TickEvents) {
|
|
|
| processor.Stop();
|
| processor.Join();
|
| - CpuProfile* profile =
|
| - profiles->StopProfiling(TokenEnumerator::kNoSecurityToken, "", 1);
|
| + CpuProfile* profile = profiles->StopProfiling("", 1);
|
| CHECK_NE(NULL, profile);
|
|
|
| // Check call trees.
|
| @@ -288,8 +286,7 @@ TEST(Issue1398) {
|
|
|
| processor.Stop();
|
| processor.Join();
|
| - CpuProfile* profile =
|
| - profiles->StopProfiling(TokenEnumerator::kNoSecurityToken, "", 1);
|
| + CpuProfile* profile = profiles->StopProfiling("", 1);
|
| CHECK_NE(NULL, profile);
|
|
|
| int actual_depth = 0;
|
| @@ -393,63 +390,6 @@ TEST(DeleteCpuProfile) {
|
| }
|
|
|
|
|
| -TEST(DeleteCpuProfileDifferentTokens) {
|
| - LocalContext env;
|
| - v8::HandleScope scope(env->GetIsolate());
|
| - v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
|
| -
|
| - CHECK_EQ(0, cpu_profiler->GetProfileCount());
|
| - v8::Local<v8::String> name1 = v8::String::New("1");
|
| - cpu_profiler->StartCpuProfiling(name1);
|
| - const v8::CpuProfile* p1 = cpu_profiler->StopCpuProfiling(name1);
|
| - CHECK_NE(NULL, p1);
|
| - CHECK_EQ(1, cpu_profiler->GetProfileCount());
|
| - unsigned uid1 = p1->GetUid();
|
| - CHECK_EQ(p1, cpu_profiler->FindCpuProfile(uid1));
|
| - v8::Local<v8::String> token1 = v8::String::New("token1");
|
| - const v8::CpuProfile* p1_t1 = cpu_profiler->FindCpuProfile(uid1, token1);
|
| - CHECK_NE(NULL, p1_t1);
|
| - CHECK_NE(p1, p1_t1);
|
| - CHECK_EQ(1, cpu_profiler->GetProfileCount());
|
| - const_cast<v8::CpuProfile*>(p1)->Delete();
|
| - CHECK_EQ(0, cpu_profiler->GetProfileCount());
|
| - CHECK_EQ(NULL, cpu_profiler->FindCpuProfile(uid1));
|
| - CHECK_EQ(NULL, cpu_profiler->FindCpuProfile(uid1, token1));
|
| - const_cast<v8::CpuProfile*>(p1_t1)->Delete();
|
| - CHECK_EQ(0, cpu_profiler->GetProfileCount());
|
| -
|
| - v8::Local<v8::String> name2 = v8::String::New("2");
|
| - cpu_profiler->StartCpuProfiling(name2);
|
| - v8::Local<v8::String> token2 = v8::String::New("token2");
|
| - const v8::CpuProfile* p2_t2 = cpu_profiler->StopCpuProfiling(name2, token2);
|
| - CHECK_NE(NULL, p2_t2);
|
| - CHECK_EQ(1, cpu_profiler->GetProfileCount());
|
| - unsigned uid2 = p2_t2->GetUid();
|
| - CHECK_NE(static_cast<int>(uid1), static_cast<int>(uid2));
|
| - const v8::CpuProfile* p2 = cpu_profiler->FindCpuProfile(uid2);
|
| - CHECK_NE(p2_t2, p2);
|
| - v8::Local<v8::String> name3 = v8::String::New("3");
|
| - cpu_profiler->StartCpuProfiling(name3);
|
| - const v8::CpuProfile* p3 = cpu_profiler->StopCpuProfiling(name3);
|
| - CHECK_NE(NULL, p3);
|
| - CHECK_EQ(2, cpu_profiler->GetProfileCount());
|
| - unsigned uid3 = p3->GetUid();
|
| - CHECK_NE(static_cast<int>(uid1), static_cast<int>(uid3));
|
| - CHECK_EQ(p3, cpu_profiler->FindCpuProfile(uid3));
|
| - const_cast<v8::CpuProfile*>(p2_t2)->Delete();
|
| - CHECK_EQ(1, cpu_profiler->GetProfileCount());
|
| - CHECK_EQ(NULL, cpu_profiler->FindCpuProfile(uid2));
|
| - CHECK_EQ(p3, cpu_profiler->FindCpuProfile(uid3));
|
| - const_cast<v8::CpuProfile*>(p2)->Delete();
|
| - CHECK_EQ(1, cpu_profiler->GetProfileCount());
|
| - CHECK_EQ(NULL, cpu_profiler->FindCpuProfile(uid2));
|
| - CHECK_EQ(p3, cpu_profiler->FindCpuProfile(uid3));
|
| - const_cast<v8::CpuProfile*>(p3)->Delete();
|
| - CHECK_EQ(0, cpu_profiler->GetProfileCount());
|
| - CHECK_EQ(NULL, cpu_profiler->FindCpuProfile(uid3));
|
| -}
|
| -
|
| -
|
| TEST(GetProfilerWhenIsolateIsNotInitialized) {
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| CHECK(i::Isolate::Current()->IsDefaultIsolate());
|
|
|