Chromium Code Reviews| Index: test/cctest/test-api.cc |
| diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc |
| index aa25b6265bf937f53af34f3e2b26903f3d16778d..d9eab046306299a9493f7e3eb0c70bdc0b67be35 100644 |
| --- a/test/cctest/test-api.cc |
| +++ b/test/cctest/test-api.cc |
| @@ -2371,7 +2371,7 @@ static void WeakPointerCallback(v8::Isolate* isolate, |
| } |
| -THREADED_TEST(ApiObjectGroups) { |
| +THREADED_TEST(OldApiObjectGroups) { |
| LocalContext env; |
| v8::Isolate* iso = env->GetIsolate(); |
| HandleScope scope(iso); |
| @@ -2457,7 +2457,93 @@ THREADED_TEST(ApiObjectGroups) { |
| } |
| -THREADED_TEST(ApiObjectGroupsCycle) { |
| +THREADED_TEST(ApiObjectGroups) { |
| + LocalContext env; |
| + v8::Isolate* iso = env->GetIsolate(); |
| + HandleScope scope(iso); |
| + |
| + Persistent<Object> g1s1; |
| + Persistent<Object> g1s2; |
| + Persistent<Object> g1c1; |
| + Persistent<Object> g2s1; |
| + Persistent<Object> g2s2; |
| + Persistent<Object> g2c1; |
| + |
| + WeakCallCounter counter(1234); |
| + |
| + { |
| + HandleScope scope(iso); |
| + g1s1 = Persistent<Object>::New(iso, Object::New()); |
| + g1s2 = Persistent<Object>::New(iso, Object::New()); |
| + g1c1 = Persistent<Object>::New(iso, Object::New()); |
| + g1s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g1s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g1c1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + |
| + g2s1 = Persistent<Object>::New(iso, Object::New()); |
| + g2s2 = Persistent<Object>::New(iso, Object::New()); |
| + g2c1 = Persistent<Object>::New(iso, Object::New()); |
| + g2s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g2s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g2c1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + } |
| + |
| + Persistent<Object> root = Persistent<Object>::New(iso, g1s1); // make a root. |
| + |
| + // Connect group 1 and 2, make a cycle. |
| + CHECK(g1s2->Set(0, g2s2)); |
| + CHECK(g2s1->Set(0, g1s1)); |
| + |
| + { |
| + Persistent<Value> g1_children[] = { g1c1 }; |
| + Persistent<Value> g2_children[] = { g2c1 }; |
| + V8::SetObjectGroupId(iso, g1s1, v8::UniqueId(1)); |
|
Sven Panne
2013/04/10 10:58:52
Style nit: Use "using".
marja
2013/04/10 13:14:51
Done.
|
| + V8::SetObjectGroupId(iso, g1s2, v8::UniqueId(1)); |
| + V8::AddImplicitReferences(g1s1, g1_children, 1); |
| + V8::SetObjectGroupId(iso, g2s1, v8::UniqueId(2)); |
| + V8::SetObjectGroupId(iso, g2s2, v8::UniqueId(2)); |
| + V8::AddImplicitReferences(g2s2, g2_children, 1); |
| + } |
| + // Do a single full GC, ensure incremental marking is stopped. |
| + HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask); |
|
Sven Panne
2013/04/10 10:58:52
Use iso->heap() instead of HEAP here and below.
marja
2013/04/10 13:14:51
Done.
|
| + |
| + // All object should be alive. |
| + CHECK_EQ(0, counter.NumberOfWeakCalls()); |
| + |
| + // Weaken the root. |
| + root.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + // But make children strong roots---all the objects (except for children) |
| + // should be collectable now. |
| + g1c1.ClearWeak(iso); |
| + g2c1.ClearWeak(iso); |
| + |
| + // Groups are deleted, rebuild groups. |
| + { |
| + Persistent<Value> g1_children[] = { g1c1 }; |
| + Persistent<Value> g2_children[] = { g2c1 }; |
| + V8::SetObjectGroupId(iso, g1s1, v8::UniqueId(1)); |
| + V8::SetObjectGroupId(iso, g1s2, v8::UniqueId(1)); |
| + V8::AddImplicitReferences(g1s1, g1_children, 1); |
| + V8::SetObjectGroupId(iso, g2s1, v8::UniqueId(2)); |
| + V8::SetObjectGroupId(iso, g2s2, v8::UniqueId(2)); |
| + V8::AddImplicitReferences(g2s2, g2_children, 1); |
| + } |
| + |
| + HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask); |
| + |
| + // All objects should be gone. 5 global handles in total. |
| + CHECK_EQ(5, counter.NumberOfWeakCalls()); |
| + |
| + // And now make children weak again and collect them. |
| + g1c1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g2c1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + |
| + HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask); |
| + CHECK_EQ(7, counter.NumberOfWeakCalls()); |
| +} |
| + |
| + |
| +THREADED_TEST(OldApiObjectGroupsCycle) { |
| LocalContext env; |
| v8::Isolate* iso = env->GetIsolate(); |
| HandleScope scope(iso); |
| @@ -2563,9 +2649,115 @@ THREADED_TEST(ApiObjectGroupsCycle) { |
| } |
| +THREADED_TEST(ApiObjectGroupsCycle) { |
| + LocalContext env; |
| + v8::Isolate* iso = env->GetIsolate(); |
| + HandleScope scope(iso); |
| + |
| + WeakCallCounter counter(1234); |
| + |
| + Persistent<Object> g1s1; |
| + Persistent<Object> g1s2; |
| + Persistent<Object> g2s1; |
| + Persistent<Object> g2s2; |
| + Persistent<Object> g3s1; |
| + Persistent<Object> g3s2; |
| + Persistent<Object> g4s1; |
| + Persistent<Object> g4s2; |
| + |
| + { |
| + HandleScope scope(iso); |
| + g1s1 = Persistent<Object>::New(iso, Object::New()); |
| + g1s2 = Persistent<Object>::New(iso, Object::New()); |
| + g1s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g1s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + CHECK(g1s1.IsWeak(iso)); |
| + CHECK(g1s2.IsWeak(iso)); |
| + |
| + g2s1 = Persistent<Object>::New(iso, Object::New()); |
| + g2s2 = Persistent<Object>::New(iso, Object::New()); |
| + g2s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g2s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + CHECK(g2s1.IsWeak(iso)); |
| + CHECK(g2s2.IsWeak(iso)); |
| + |
| + g3s1 = Persistent<Object>::New(iso, Object::New()); |
| + g3s2 = Persistent<Object>::New(iso, Object::New()); |
| + g3s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g3s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + CHECK(g3s1.IsWeak(iso)); |
| + CHECK(g3s2.IsWeak(iso)); |
| + |
| + g4s1 = Persistent<Object>::New(iso, Object::New()); |
| + g4s2 = Persistent<Object>::New(iso, Object::New()); |
| + g4s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g4s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + CHECK(g4s1.IsWeak(iso)); |
| + CHECK(g4s2.IsWeak(iso)); |
| + } |
| + |
| + Persistent<Object> root = Persistent<Object>::New(iso, g1s1); // make a root. |
| + |
| + // Connect groups. We're building the following cycle: |
| + // G1: { g1s1, g2s1 }, g1s1 implicitly references g2s1, ditto for other |
| + // groups. |
| + { |
| + Persistent<Value> g1_children[] = { g2s1 }; |
| + Persistent<Value> g2_children[] = { g3s1 }; |
| + Persistent<Value> g3_children[] = { g4s1 }; |
| + Persistent<Value> g4_children[] = { g1s1 }; |
| + V8::SetObjectGroupId(iso, g1s1, v8::UniqueId(1)); |
| + V8::SetObjectGroupId(iso, g1s2, v8::UniqueId(1)); |
| + V8::AddImplicitReferences(g1s1, g1_children, 1); |
| + V8::SetObjectGroupId(iso, g2s1, v8::UniqueId(2)); |
| + V8::SetObjectGroupId(iso, g2s2, v8::UniqueId(2)); |
| + V8::AddImplicitReferences(g2s1, g2_children, 1); |
| + V8::SetObjectGroupId(iso, g3s1, v8::UniqueId(3)); |
| + V8::SetObjectGroupId(iso, g3s2, v8::UniqueId(3)); |
| + V8::AddImplicitReferences(g3s1, g3_children, 1); |
| + V8::SetObjectGroupId(iso, g4s1, v8::UniqueId(4)); |
| + V8::SetObjectGroupId(iso, g4s2, v8::UniqueId(4)); |
| + V8::AddImplicitReferences(g4s1, g4_children, 1); |
| + } |
| + // Do a single full GC |
| + HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask); |
| + |
| + // All object should be alive. |
| + CHECK_EQ(0, counter.NumberOfWeakCalls()); |
| + |
| + // Weaken the root. |
| + root.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + |
| + // Groups are deleted, rebuild groups. |
| + { |
| + Persistent<Value> g1_children[] = { g2s1 }; |
| + Persistent<Value> g2_children[] = { g3s1 }; |
| + Persistent<Value> g3_children[] = { g4s1 }; |
| + Persistent<Value> g4_children[] = { g1s1 }; |
| + V8::SetObjectGroupId(iso, g1s1, v8::UniqueId(1)); |
| + V8::SetObjectGroupId(iso, g1s2, v8::UniqueId(1)); |
| + V8::AddImplicitReferences(g1s1, g1_children, 1); |
| + V8::SetObjectGroupId(iso, g2s1, v8::UniqueId(2)); |
| + V8::SetObjectGroupId(iso, g2s2, v8::UniqueId(2)); |
| + V8::AddImplicitReferences(g2s1, g2_children, 1); |
| + V8::SetObjectGroupId(iso, g3s1, v8::UniqueId(3)); |
| + V8::SetObjectGroupId(iso, g3s2, v8::UniqueId(3)); |
| + V8::AddImplicitReferences(g3s1, g3_children, 1); |
| + V8::SetObjectGroupId(iso, g4s1, v8::UniqueId(4)); |
| + V8::SetObjectGroupId(iso, g4s2, v8::UniqueId(4)); |
| + V8::AddImplicitReferences(g4s1, g4_children, 1); |
| + } |
| + |
| + HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask); |
| + |
| + // All objects should be gone. 9 global handles in total. |
| + CHECK_EQ(9, counter.NumberOfWeakCalls()); |
| +} |
| + |
| + |
| // TODO(mstarzinger): This should be a THREADED_TEST but causes failures |
| // on the buildbots, so was made non-threaded for the time being. |
| -TEST(ApiObjectGroupsCycleForScavenger) { |
| +TEST(OldApiObjectGroupsCycleForScavenger) { |
| i::FLAG_stress_compaction = false; |
| i::FLAG_gc_global = false; |
| LocalContext env; |
| @@ -2660,6 +2852,103 @@ TEST(ApiObjectGroupsCycleForScavenger) { |
| } |
| +// TODO(mstarzinger): This should be a THREADED_TEST but causes failures |
| +// on the buildbots, so was made non-threaded for the time being. |
| +TEST(ApiObjectGroupsCycleForScavenger) { |
| + i::FLAG_stress_compaction = false; |
| + i::FLAG_gc_global = false; |
| + LocalContext env; |
| + v8::Isolate* iso = env->GetIsolate(); |
| + HandleScope scope(iso); |
| + |
| + WeakCallCounter counter(1234); |
| + |
| + Persistent<Object> g1s1; |
| + Persistent<Object> g1s2; |
| + Persistent<Object> g2s1; |
| + Persistent<Object> g2s2; |
| + Persistent<Object> g3s1; |
| + Persistent<Object> g3s2; |
| + |
| + { |
| + HandleScope scope(iso); |
| + g1s1 = Persistent<Object>::New(iso, Object::New()); |
| + g1s2 = Persistent<Object>::New(iso, Object::New()); |
| + g1s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g1s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + |
| + g2s1 = Persistent<Object>::New(iso, Object::New()); |
| + g2s2 = Persistent<Object>::New(iso, Object::New()); |
| + g2s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g2s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + |
| + g3s1 = Persistent<Object>::New(iso, Object::New()); |
| + g3s2 = Persistent<Object>::New(iso, Object::New()); |
| + g3s1.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + g3s2.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + } |
| + |
| + // Make a root. |
| + Persistent<Object> root = Persistent<Object>::New(iso, g1s1); |
| + root.MarkPartiallyDependent(iso); |
| + |
| + // Connect groups. We're building the following cycle: |
| + // G1: { g1s1, g2s1 }, g1s1 implicitly references g2s1, ditto for other |
| + // groups. |
| + { |
| + g1s1.MarkPartiallyDependent(iso); |
| + g1s2.MarkPartiallyDependent(iso); |
| + g2s1.MarkPartiallyDependent(iso); |
| + g2s2.MarkPartiallyDependent(iso); |
| + g3s1.MarkPartiallyDependent(iso); |
| + g3s2.MarkPartiallyDependent(iso); |
| + V8::SetObjectGroupId(iso, g1s1, v8::UniqueId(1)); |
| + V8::SetObjectGroupId(iso, g1s2, v8::UniqueId(1)); |
| + g1s1->Set(v8_str("x"), g2s1); |
| + V8::SetObjectGroupId(iso, g2s1, v8::UniqueId(2)); |
| + V8::SetObjectGroupId(iso, g2s2, v8::UniqueId(2)); |
| + g2s1->Set(v8_str("x"), g3s1); |
| + V8::SetObjectGroupId(iso, g3s1, v8::UniqueId(3)); |
| + V8::SetObjectGroupId(iso, g3s2, v8::UniqueId(3)); |
| + g3s1->Set(v8_str("x"), g1s1); |
| + } |
| + |
| + HEAP->CollectGarbage(i::NEW_SPACE); |
| + |
| + // All objects should be alive. |
| + CHECK_EQ(0, counter.NumberOfWeakCalls()); |
| + |
| + // Weaken the root. |
| + root.MakeWeak(iso, reinterpret_cast<void*>(&counter), &WeakPointerCallback); |
| + root.MarkPartiallyDependent(iso); |
| + |
| + v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
| + // Groups are deleted, rebuild groups. |
| + { |
| + g1s1.MarkPartiallyDependent(isolate); |
| + g1s2.MarkPartiallyDependent(isolate); |
| + g2s1.MarkPartiallyDependent(isolate); |
| + g2s2.MarkPartiallyDependent(isolate); |
| + g3s1.MarkPartiallyDependent(isolate); |
| + g3s2.MarkPartiallyDependent(isolate); |
| + V8::SetObjectGroupId(iso, g1s1, v8::UniqueId(1)); |
| + V8::SetObjectGroupId(iso, g1s2, v8::UniqueId(1)); |
| + g1s1->Set(v8_str("x"), g2s1); |
| + V8::SetObjectGroupId(iso, g2s1, v8::UniqueId(2)); |
| + V8::SetObjectGroupId(iso, g2s2, v8::UniqueId(2)); |
| + g2s1->Set(v8_str("x"), g3s1); |
| + V8::SetObjectGroupId(iso, g3s1, v8::UniqueId(3)); |
| + V8::SetObjectGroupId(iso, g3s2, v8::UniqueId(3)); |
| + g3s1->Set(v8_str("x"), g1s1); |
| + } |
| + |
| + HEAP->CollectGarbage(i::NEW_SPACE); |
| + |
| + // All objects should be gone. 7 global handles in total. |
| + CHECK_EQ(7, counter.NumberOfWeakCalls()); |
| +} |
| + |
| + |
| THREADED_TEST(ScriptException) { |
| LocalContext env; |
| v8::HandleScope scope(env->GetIsolate()); |