Reviewers: jochen, ernstm, mstarzinger, Michael Starzinger,
https://codereview.chromium.org/422013002/diff/1/src/heap.cc
File src/heap.cc (right):
https://codereview.chromium.org/422013002/diff/1/src/heap.cc#newcode4258
src/heap.cc:4258: if (!FLAG_incremental_marking) return true;
On 2014/07/28 13:11:13, jochen wrote:
why not return false (meaning "no need to call again"?)
Return true means that "we are done".
Description:
Removed IdleGlobalGC and just perform IdleNotification when incremental
marking
is on.
BUG=397026
LOG=n
Please review this at https://codereview.chromium.org/422013002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+3, -67 lines):
M src/heap.h
M src/heap.cc
Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index
36995336a47b8caf948227f0a78fed275842720c..63e0ff0340585b32c51b6a34d05d65cdd8919134
100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -4254,6 +4254,9 @@ void Heap::AdvanceIdleIncrementalMarking(intptr_t
step_size) {
bool Heap::IdleNotification(int hint) {
+ // If incremental marking is off, we do not perform idle notification.
+ if (!FLAG_incremental_marking) return true;
+
// Hints greater than this value indicate that
// the embedder is requesting a lot of GC work.
const int kMaxHint = 1000;
@@ -4290,10 +4293,6 @@ bool Heap::IdleNotification(int hint) {
return false;
}
- if (!FLAG_incremental_marking || isolate_->serializer_enabled()) {
- return IdleGlobalGC();
- }
-
// By doing small chunks of GC work in each IdleNotification,
// perform a round of incremental GCs and after that wait until
// the mutator creates enough garbage to justify a new round.
@@ -4348,66 +4347,6 @@ bool Heap::IdleNotification(int hint) {
}
-bool Heap::IdleGlobalGC() {
- static const int kIdlesBeforeScavenge = 4;
- static const int kIdlesBeforeMarkSweep = 7;
- static const int kIdlesBeforeMarkCompact = 8;
- static const int kMaxIdleCount = kIdlesBeforeMarkCompact + 1;
- static const unsigned int kGCsBetweenCleanup = 4;
-
- if (!last_idle_notification_gc_count_init_) {
- last_idle_notification_gc_count_ = gc_count_;
- last_idle_notification_gc_count_init_ = true;
- }
-
- bool uncommit = true;
- bool finished = false;
-
- // Reset the number of idle notifications received when a number of
- // GCs have taken place. This allows another round of cleanup based
- // on idle notifications if enough work has been carried out to
- // provoke a number of garbage collections.
- if (gc_count_ - last_idle_notification_gc_count_ < kGCsBetweenCleanup) {
- number_idle_notifications_ =
- Min(number_idle_notifications_ + 1, kMaxIdleCount);
- } else {
- number_idle_notifications_ = 0;
- last_idle_notification_gc_count_ = gc_count_;
- }
-
- if (number_idle_notifications_ == kIdlesBeforeScavenge) {
- CollectGarbage(NEW_SPACE, "idle notification");
- new_space_.Shrink();
- last_idle_notification_gc_count_ = gc_count_;
- } else if (number_idle_notifications_ == kIdlesBeforeMarkSweep) {
- // Before doing the mark-sweep collections we clear the
- // compilation cache to avoid hanging on to source code and
- // generated code for cached functions.
- isolate_->compilation_cache()->Clear();
-
- CollectAllGarbage(kReduceMemoryFootprintMask, "idle notification");
- new_space_.Shrink();
- last_idle_notification_gc_count_ = gc_count_;
-
- } else if (number_idle_notifications_ == kIdlesBeforeMarkCompact) {
- CollectAllGarbage(kReduceMemoryFootprintMask, "idle notification");
- new_space_.Shrink();
- last_idle_notification_gc_count_ = gc_count_;
- number_idle_notifications_ = 0;
- finished = true;
- } else if (number_idle_notifications_ > kIdlesBeforeMarkCompact) {
- // If we have received more than kIdlesBeforeMarkCompact idle
- // notifications we do not perform any cleanup because we don't
- // expect to gain much by doing so.
- finished = true;
- }
-
- if (uncommit) UncommitFromSpace();
-
- return finished;
-}
-
-
#ifdef DEBUG
void Heap::Print() {
Index: src/heap.h
diff --git a/src/heap.h b/src/heap.h
index
fc3c86db446f14d9eb5d0367c7d126f30666bfdd..944babbb2baa1c0b7c87fc1a2493025a7dc70c33
100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -2078,9 +2078,6 @@ class Heap {
return heap_size_mb / kMbPerMs;
}
- // Returns true if no more GC work is left.
- bool IdleGlobalGC();
-
void AdvanceIdleIncrementalMarking(intptr_t step_size);
void ClearObjectStats(bool clear_last_time_stats = false);
--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
