Revision: 18691
Author: [email protected]
Date: Mon Jan 20 14:14:07 2014 UTC
Log: Enable incremental marking when --expose-gc is turned on.
BUG=
[email protected], [email protected]
Review URL: https://codereview.chromium.org/139343007
http://code.google.com/p/v8/source/detail?r=18691
Modified:
/branches/bleeding_edge/src/extensions/gc-extension.cc
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/incremental-marking.cc
/branches/bleeding_edge/src/mark-compact.cc
=======================================
--- /branches/bleeding_edge/src/extensions/gc-extension.cc Fri Jan 17
10:52:00 2014 UTC
+++ /branches/bleeding_edge/src/extensions/gc-extension.cc Mon Jan 20
14:14:07 2014 UTC
@@ -45,8 +45,8 @@
isolate->heap()->CollectGarbage(
NEW_SPACE, "gc extension", v8::kGCCallbackFlagForced);
} else {
- isolate->heap()->CollectAllGarbage(
- Heap::kNoGCFlags, "gc extension", v8::kGCCallbackFlagForced);
+ isolate->heap()->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask,
+ "gc extension", v8::kGCCallbackFlagForced);
}
}
=======================================
--- /branches/bleeding_edge/src/heap.cc Mon Jan 20 11:57:56 2014 UTC
+++ /branches/bleeding_edge/src/heap.cc Mon Jan 20 14:14:07 2014 UTC
@@ -5619,7 +5619,7 @@
return false;
}
- if (!FLAG_incremental_marking || FLAG_expose_gc ||
Serializer::enabled()) {
+ if (!FLAG_incremental_marking || Serializer::enabled()) {
return IdleGlobalGC();
}
=======================================
--- /branches/bleeding_edge/src/incremental-marking.cc Fri Oct 25 11:10:28
2013 UTC
+++ /branches/bleeding_edge/src/incremental-marking.cc Mon Jan 20 14:14:07
2014 UTC
@@ -498,12 +498,10 @@
// debug tests run with incremental marking and some without.
static const intptr_t kActivationThreshold = 0;
#endif
- // Only start incremental marking in a safe state: 1) when expose GC is
- // deactivated, 2) when incremental marking is turned on, 3) when we are
- // currently not in a GC, and 4) when we are currently not serializing
- // or deserializing the heap.
- return !FLAG_expose_gc &&
- FLAG_incremental_marking &&
+ // Only start incremental marking in a safe state: 1) when incremental
+ // marking is turned on, 2) when we are currently not in a GC, and
+ // 3) when we are currently not serializing or deserializing the heap.
+ return FLAG_incremental_marking &&
FLAG_incremental_marking_steps &&
heap_->gc_state() == Heap::NOT_IN_GC &&
!Serializer::enabled() &&
=======================================
--- /branches/bleeding_edge/src/mark-compact.cc Mon Jan 20 11:57:56 2014 UTC
+++ /branches/bleeding_edge/src/mark-compact.cc Mon Jan 20 14:14:07 2014 UTC
@@ -4121,7 +4121,6 @@
if (FLAG_parallel_sweeping) how_to_sweep = PARALLEL_CONSERVATIVE;
if (FLAG_concurrent_sweeping) how_to_sweep = CONCURRENT_CONSERVATIVE;
}
- if (FLAG_expose_gc) how_to_sweep = CONSERVATIVE;
if (sweep_precisely_) how_to_sweep = PRECISE;
// Unlink evacuation candidates before sweeper threads access the list of
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
