Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2085)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/dart_api_impl_test.cc

Issue 2281193002: Treat background finalization as another GC task so it won't run in parallel with the marker. (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/dart_api_impl.cc ('k') | runtime/vm/dart_api_state.cc » ('j') | runtime/vm/dart_api_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/dart_api_impl_test.cc
diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc
index d8a92992aa66d50172110c6f61f992a5d4bbad92..ae0812cc9dc2b3eeb2e6dd83fcbe9a58c4fd1a29 100644
--- a/runtime/vm/dart_api_impl_test.cc
+++ b/runtime/vm/dart_api_impl_test.cc
@@ -1217,11 +1217,11 @@ class GCTestHelper : public AllStatic {
Isolate::Current()->heap()->new_space()->Scavenge(invoke_api_callbacks);
}
- static void WaitForFinalizationTasks() {
+ static void WaitForGCTasks() {
Thread* thread = Thread::Current();
- Heap* heap = thread->isolate()->heap();
- MonitorLocker ml(heap->finalization_tasks_lock());
- while (heap->finalization_tasks() > 0) {
+ PageSpace* old_space = thread->isolate()->heap()->old_space();
+ MonitorLocker ml(old_space->tasks_lock());
+ while (old_space->tasks() > 0) {
ml.WaitWithSafepointCheck(thread);
}
}
@@ -1264,11 +1264,11 @@ TEST_CASE(ExternalStringCallback) {
EXPECT_EQ(40, peer8);
EXPECT_EQ(41, peer16);
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT_EQ(40, peer8);
EXPECT_EQ(41, peer16);
Isolate::Current()->heap()->CollectGarbage(Heap::kNew);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT_EQ(80, peer8);
EXPECT_EQ(82, peer16);
}
@@ -2380,6 +2380,13 @@ static void NopCallback(void* isolate_callback_data,
}
+static void UnreachedCallback(void* isolate_callback_data,
+ Dart_WeakPersistentHandle handle,
+ void* peer) {
+ UNREACHABLE();
+}
+
+
static void ExternalTypedDataFinalizer(void* isolate_callback_data,
Dart_WeakPersistentHandle handle,
void* peer) {
@@ -2405,39 +2412,25 @@ TEST_CASE(ExternalTypedDataCallback) {
TransitionNativeToVM transition(thread);
EXPECT(peer == 0);
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(peer == 0);
Isolate::Current()->heap()->CollectGarbage(Heap::kNew);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(peer == 42);
}
}
-static Monitor* slow_finalizers_monitor = NULL;
-static intptr_t slow_finalizers_waiting = 0;
-
-
static void SlowFinalizer(void* isolate_callback_data,
Dart_WeakPersistentHandle handle,
void* peer) {
- {
- MonitorLocker ml(slow_finalizers_monitor);
- slow_finalizers_waiting++;
- while (slow_finalizers_waiting < 10) {
- ml.Wait();
- }
- ml.NotifyAll();
- }
-
+ OS::Sleep(10);
siva 2016/08/29 22:05:09 Why is this sleep necessary as you now make sure o
rmacnak 2016/08/29 23:09:45 Trying to stress the situation where the marker ha
intptr_t* count = reinterpret_cast<intptr_t*>(peer);
- AtomicOperations::IncrementBy(count, 1);
+ (*count)++;
}
TEST_CASE(SlowFinalizer) {
- slow_finalizers_monitor = new Monitor();
-
intptr_t count = 0;
for (intptr_t i = 0; i < 10; i++) {
Dart_EnterScope();
@@ -2455,12 +2448,10 @@ TEST_CASE(SlowFinalizer) {
{
TransitionNativeToVM transition(thread);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
}
EXPECT_EQ(20, count);
-
- delete slow_finalizers_monitor;
}
@@ -2515,7 +2506,7 @@ TEST_CASE(Float32x4List) {
{
TransitionNativeToVM transition(thread);
Isolate::Current()->heap()->CollectGarbage(Heap::kNew);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(peer == 42);
}
}
@@ -2792,7 +2783,7 @@ TEST_CASE(WeakPersistentHandle) {
TransitionNativeToVM transition(thread);
// Garbage collect new space again.
GCTestHelper::CollectNewSpace(Heap::kIgnoreApiCallbacks);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
}
{
@@ -2808,7 +2799,7 @@ TEST_CASE(WeakPersistentHandle) {
TransitionNativeToVM transition(thread);
// Garbage collect old space again.
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
}
{
@@ -2828,6 +2819,27 @@ TEST_CASE(WeakPersistentHandle) {
}
+TEST_CASE(WeakPersistentHandleErrors) {
+ Dart_EnterScope();
+
+ // NULL callback.
+ Dart_Handle obj1 = NewString("new string");
+ EXPECT_VALID(obj1);
+ Dart_WeakPersistentHandle ref1 = Dart_NewWeakPersistentHandle(
+ obj1, NULL, 0, NULL);
+ EXPECT_EQ(ref1, static_cast<void*>(NULL));
+
+ // Immediate object.
+ Dart_Handle obj2 = Dart_NewInteger(0);
+ EXPECT_VALID(obj2);
+ Dart_WeakPersistentHandle ref2 = Dart_NewWeakPersistentHandle(
+ obj2, NULL, 0, WeakPersistentHandleCallback);
+ EXPECT_EQ(ref2, static_cast<void*>(NULL));
+
+ Dart_ExitScope();
+}
+
+
static void WeakPersistentHandlePeerFinalizer(void* isolate_callback_data,
Dart_WeakPersistentHandle handle,
void* peer) {
@@ -2853,7 +2865,7 @@ TEST_CASE(WeakPersistentHandleCallback) {
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
EXPECT(peer == 0);
GCTestHelper::CollectNewSpace(Heap::kIgnoreApiCallbacks);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(peer == 42);
}
}
@@ -2880,7 +2892,7 @@ TEST_CASE(WeakPersistentHandleNoCallback) {
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
EXPECT(peer == 0);
GCTestHelper::CollectNewSpace(Heap::kIgnoreApiCallbacks);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(peer == 0);
}
}
@@ -2941,7 +2953,7 @@ TEST_CASE(WeakPersistentHandleExternalAllocationSize) {
// Collect weakly referenced string, and promote strongly referenced string.
GCTestHelper::CollectNewSpace(Heap::kIgnoreApiCallbacks);
GCTestHelper::CollectNewSpace(Heap::kIgnoreApiCallbacks);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(heap->ExternalInWords(Heap::kNew) == 0);
EXPECT(heap->ExternalInWords(Heap::kOld) == kWeak2ExternalSize / kWordSize);
}
@@ -2952,7 +2964,7 @@ TEST_CASE(WeakPersistentHandleExternalAllocationSize) {
{
TransitionNativeToVM transition(thread);
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(heap->ExternalInWords(Heap::kOld) == 0);
}
}
@@ -2998,7 +3010,7 @@ TEST_CASE(WeakPersistentHandleExternalAllocationSizeNewspaceGC) {
{
TransitionNativeToVM transition(thread);
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
EXPECT(heap->ExternalInWords(Heap::kOld) == 0);
}
}
@@ -3045,17 +3057,18 @@ TEST_CASE(WeakPersistentHandleExternalAllocationSizeOddReferents) {
static const intptr_t kWeak1ExternalSize = 1 * KB;
Dart_WeakPersistentHandle weak2 = NULL;
static const intptr_t kWeak2ExternalSize = 2 * KB;
+ EXPECT_EQ(0, heap->ExternalInWords(Heap::kOld));
{
Dart_EnterScope();
Dart_Handle dart_true = Dart_True(); // VM heap object.
EXPECT_VALID(dart_true);
weak1 = Dart_NewWeakPersistentHandle(
- dart_true, NULL, kWeak1ExternalSize, NopCallback);
+ dart_true, NULL, kWeak1ExternalSize, UnreachedCallback);
EXPECT_VALID(AsHandle(weak1));
- Dart_Handle zero = Dart_NewInteger(0); // Smi.
+ Dart_Handle zero = Dart_False(); // VM heap object.
EXPECT_VALID(zero);
weak2 = Dart_NewWeakPersistentHandle(
- zero, NULL, kWeak2ExternalSize, NopCallback);
+ zero, NULL, kWeak2ExternalSize, UnreachedCallback);
EXPECT_VALID(AsHandle(weak2));
// Both should be charged to old space.
EXPECT(heap->ExternalInWords(Heap::kOld) ==
@@ -3065,6 +3078,7 @@ TEST_CASE(WeakPersistentHandleExternalAllocationSizeOddReferents) {
Dart_Isolate isolate = reinterpret_cast<Dart_Isolate>(Isolate::Current());
Dart_DeleteWeakPersistentHandle(isolate, weak1);
Dart_DeleteWeakPersistentHandle(isolate, weak2);
+ EXPECT_EQ(0, heap->ExternalInWords(Heap::kOld));
{
TransitionNativeToVM transition(thread);
Isolate::Current()->heap()->CollectGarbage(Heap::kOld);
@@ -8824,7 +8838,7 @@ TEST_CASE(MakeExternalString) {
{
TransitionNativeToVM transition(thread);
Isolate::Current()->heap()->CollectAllGarbage();
- GCTestHelper::WaitForFinalizationTasks();
+ GCTestHelper::WaitForGCTasks();
}
EXPECT_EQ(80, peer8);
EXPECT_EQ(82, peer16);
« no previous file with comments | « runtime/vm/dart_api_impl.cc ('k') | runtime/vm/dart_api_state.cc » ('j') | runtime/vm/dart_api_state.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698