Revision: 13099
Author: [email protected]
Date: Fri Nov 30 01:42:20 2012
Log: Revert "Allow incremental marking when expose_gc is turned on."
This reverts r13072 from bleeding edge.
[email protected]
Review URL: https://codereview.chromium.org/11316268
http://code.google.com/p/v8/source/detail?r=13099
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 Wed Nov 28
00:43:10 2012
+++ /branches/bleeding_edge/src/extensions/gc-extension.cc Fri Nov 30
01:42:20 2012
@@ -43,7 +43,7 @@
if (args[0]->BooleanValue()) {
HEAP->CollectGarbage(NEW_SPACE, "gc extension");
} else {
- HEAP->CollectAllGarbage(Heap::kAbortIncrementalMarkingMask, "gc
extension");
+ HEAP->CollectAllGarbage(Heap::kNoGCFlags, "gc extension");
}
return v8::Undefined();
}
=======================================
--- /branches/bleeding_edge/src/heap.cc Wed Nov 28 23:38:00 2012
+++ /branches/bleeding_edge/src/heap.cc Fri Nov 30 01:42:20 2012
@@ -5323,7 +5323,8 @@
AgeInlineCaches();
}
int mark_sweep_time = Min(TimeMarkSweepWouldTakeInMs(), 1000);
- if (hint >= mark_sweep_time && incremental_marking()->IsStopped()) {
+ if (hint >= mark_sweep_time && !FLAG_expose_gc &&
+ incremental_marking()->IsStopped()) {
HistogramTimerScope scope(isolate_->counters()->gc_context());
CollectAllGarbage(kReduceMemoryFootprintMask,
"idle notification: contexts disposed");
@@ -5338,7 +5339,7 @@
return false;
}
- if (!FLAG_incremental_marking || Serializer::enabled()) {
+ if (!FLAG_incremental_marking || FLAG_expose_gc ||
Serializer::enabled()) {
return IdleGlobalGC();
}
=======================================
--- /branches/bleeding_edge/src/incremental-marking.cc Thu Nov 29 07:13:49
2012
+++ /branches/bleeding_edge/src/incremental-marking.cc Fri Nov 30 01:42:20
2012
@@ -491,7 +491,8 @@
static const intptr_t kActivationThreshold = 0;
#endif
- return FLAG_incremental_marking &&
+ return !FLAG_expose_gc &&
+ FLAG_incremental_marking &&
!Serializer::enabled() &&
heap_->PromotedSpaceSizeOfObjects() > kActivationThreshold;
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
