Revision: 13072
Author: [email protected]
Date: Wed Nov 28 00:43:10 2012
Log: Allow incremental marking when expose_gc is turned on.
BUG=
Review URL: https://codereview.chromium.org/11299154
http://code.google.com/p/v8/source/detail?r=13072
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/extensions/gc-extension.cc Thu Oct 25
05:23:03 2012
+++ /branches/bleeding_edge/src/extensions/gc-extension.cc Wed Nov 28
00:43:10 2012
@@ -43,7 +43,7 @@
if (args[0]->BooleanValue()) {
HEAP->CollectGarbage(NEW_SPACE, "gc extension");
} else {
- HEAP->CollectAllGarbage(Heap::kNoGCFlags, "gc extension");
+ HEAP->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask, "gc
extension");
}
return v8::Undefined();
}
=======================================
--- /branches/bleeding_edge/src/heap.cc Tue Nov 27 09:03:12 2012
+++ /branches/bleeding_edge/src/heap.cc Wed Nov 28 00:43:10 2012
@@ -5322,8 +5322,7 @@
AgeInlineCaches();
}
int mark_sweep_time = Min(TimeMarkSweepWouldTakeInMs(), 1000);
- if (hint >= mark_sweep_time && !FLAG_expose_gc &&
- incremental_marking()->IsStopped()) {
+ if (hint >= mark_sweep_time && incremental_marking()->IsStopped()) {
HistogramTimerScope scope(isolate_->counters()->gc_context());
CollectAllGarbage(kReduceMemoryFootprintMask,
"idle notification: contexts disposed");
@@ -5342,7 +5341,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 Wed Nov 21 23:05:20
2012
+++ /branches/bleeding_edge/src/incremental-marking.cc Wed Nov 28 00:43:10
2012
@@ -493,8 +493,7 @@
static const intptr_t kActivationThreshold = 0;
#endif
- return !FLAG_expose_gc &&
- FLAG_incremental_marking &&
+ return FLAG_incremental_marking &&
!Serializer::enabled() &&
heap_->PromotedSpaceSizeOfObjects() > kActivationThreshold;
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
