From 4c1782022af2562ce14c25d57d7479b475522452 Mon Sep 17 00:00:00 2001 From: "hpayer@chromium.org" Date: Mon, 6 May 2013 13:39:54 +0000 Subject: [PATCH] Revert fix incremental marking speed accelleration and start incremental marking when old space is almost full when pretenuring objects. BUG= Review URL: https://codereview.chromium.org/14988004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14558 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/incremental-marking.cc | 11 +---------- src/incremental-marking.h | 5 ++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/incremental-marking.cc b/src/incremental-marking.cc index c34c65ffd8..658a34c9cd 100644 --- a/src/incremental-marking.cc +++ b/src/incremental-marking.cc @@ -860,15 +860,6 @@ void IncrementalMarking::MarkingComplete(CompletionAction action) { } -void IncrementalMarking::OldSpaceStep(intptr_t allocated) { - if (IsStopped() && WorthActivating() && heap_->NextGCIsLikelyToBeFull()) { - Start(); - } else { - Step(allocated * kFastMarking / kInitialMarkingSpeed, GC_VIA_STACK_GUARD); - } -} - - void IncrementalMarking::Step(intptr_t allocated_bytes, CompletionAction action) { if (heap_->gc_state() != Heap::NOT_IN_GC || @@ -974,7 +965,7 @@ void IncrementalMarking::Step(intptr_t allocated_bytes, PrintPID("Postponing speeding up marking until marking starts\n"); } } else { - marking_speed_ += kMarkingSpeedAccelleration; + marking_speed_ += kMarkingSpeedAccellerationInterval; marking_speed_ = static_cast( Min(kMaxMarkingSpeed, static_cast(marking_speed_ * 1.3))); diff --git a/src/incremental-marking.h b/src/incremental-marking.h index 7b6927e873..fc5a978cc4 100644 --- a/src/incremental-marking.h +++ b/src/incremental-marking.h @@ -110,7 +110,10 @@ class IncrementalMarking { static const intptr_t kMarkingSpeedAccelleration = 2; static const intptr_t kMaxMarkingSpeed = 1000; - void OldSpaceStep(intptr_t allocated); + void OldSpaceStep(intptr_t allocated) { + Step(allocated * kFastMarking / kInitialMarkingSpeed, + GC_VIA_STACK_GUARD); + } void Step(intptr_t allocated, CompletionAction action);