Reland part of r23285 "Start incremental marking in idle time handler only if it is worthwhile.""

src/heap/gc-idle-time-handler.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/heap/gc-idle-time-handler.h"
 #include "src/heap/gc-tracer.h"
 #include "src/utils.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 28 matching lines @@
     size_t size_of_objects, size_t mark_compact_speed_in_bytes_per_ms) {
   if (mark_compact_speed_in_bytes_per_ms == 0) {
     mark_compact_speed_in_bytes_per_ms = kInitialConservativeMarkCompactSpeed;
   }
   size_t result = size_of_objects / mark_compact_speed_in_bytes_per_ms;
   return Min(result, kMaxMarkCompactTimeInMs);
 }
 
 
 GCIdleTimeAction GCIdleTimeHandler::Compute(int idle_time_in_ms,
-                                            int contexts_disposed,
-                                            size_t size_of_objects,
-                                            bool incremental_marking_stopped,
+                                            HeapState heap_state,
                                             GCTracer* gc_tracer) {
   if (IsIdleRoundFinished()) {
-    if (EnoughGarbageSinceLastIdleRound() || contexts_disposed > 0) {
+    if (EnoughGarbageSinceLastIdleRound() || heap_state.contexts_disposed > 0) {
       StartIdleRound();
     } else {
       return GCIdleTimeAction::Nothing();
     }
   }
-  if (incremental_marking_stopped) {
+  if (heap_state.incremental_marking_stopped) {
     size_t speed =
         static_cast<size_t>(gc_tracer->MarkCompactSpeedInBytesPerMillisecond());
-    if (idle_time_in_ms >=
-        static_cast<int>(EstimateMarkCompactTime(size_of_objects, speed))) {
+    if (idle_time_in_ms >= static_cast<int>(EstimateMarkCompactTime(
+                               heap_state.size_of_objects, speed))) {
       // If there are no more than two GCs left in this idle round and we are
       // allowed to do a full GC, then make those GCs full in order to compact
       // the code space.
       // TODO(ulan): Once we enable code compaction for incremental marking, we
       // can get rid of this special case and always start incremental marking.
       int remaining_mark_sweeps =
           kMaxMarkCompactsInIdleRound - mark_compacts_since_idle_round_started_;
-      if (contexts_disposed > 0 || remaining_mark_sweeps <= 2) {
+      if (heap_state.contexts_disposed > 0 || remaining_mark_sweeps <= 2 ||
+          !heap_state.can_start_incremental_marking) {
         return GCIdleTimeAction::FullGC();
       }
     }
+    if (!heap_state.can_start_incremental_marking) {
+      return GCIdleTimeAction::Nothing();
+    }
   }
   intptr_t speed = gc_tracer->IncrementalMarkingSpeedInBytesPerMillisecond();
   size_t step_size =
       static_cast<size_t>(EstimateMarkingStepSize(idle_time_in_ms, speed));
   return GCIdleTimeAction::IncrementalMarking(step_size);
 }
 }
 }