Revert fix incremental marking speed accelleration and start incremental marking...

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

diff --git a/src/incremental-marking.cc b/src/incremental-marking.cc
index c34c65f..658a34c 100644 (file)
--- 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<int>(
           Min(kMaxMarkingSpeed,
               static_cast<intptr_t>(marking_speed_ * 1.3)));

diff --git a/src/incremental-marking.h b/src/incremental-marking.h
index 7b6927e..fc5a978 100644 (file)
--- 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);