Revert of [heap] Respect idle deadline in AdvanceIncrementalMarking more carefully.

src/heap/incremental-marking.cc

 // Copyright 2012 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/incremental-marking.h"
 
 #include "src/code-stubs.h"
 #include "src/compilation-cache.h"
 #include "src/conversions.h"
 #include "src/heap/gc-idle-time-handler.h"
@@ skipping 1006 matching lines @@
 
 double IncrementalMarking::AdvanceIncrementalMarking(
     double deadline_in_ms, IncrementalMarking::StepActions step_actions) {
   DCHECK(!IsStopped());
 
   intptr_t step_size_in_bytes = GCIdleTimeHandler::EstimateMarkingStepSize(
       GCIdleTimeHandler::kIncrementalMarkingStepTimeInMs,
       heap()
           ->tracer()
           ->FinalIncrementalMarkCompactSpeedInBytesPerMillisecond());
-  double remaining_time_in_ms =
-      deadline_in_ms - heap()->MonotonicallyIncreasingTimeInMs();
-  while (remaining_time_in_ms >=
-         GCIdleTimeHandler::kMinIncrementalMarkingStepTimeInMs) {
-    intptr_t bytes_processed =
+  double remaining_time_in_ms = 0.0;
+  intptr_t bytes_processed = 0;
+
+  do {
+    bytes_processed =
         Step(step_size_in_bytes, step_actions.completion_action,
              step_actions.force_marking, step_actions.force_completion);
     remaining_time_in_ms =
         deadline_in_ms - heap()->MonotonicallyIncreasingTimeInMs();
-    if (bytes_processed == 0) break;
-  }
+  } while (bytes_processed > 0 &&
+           remaining_time_in_ms >=
+               2.0 * GCIdleTimeHandler::kIncrementalMarkingStepTimeInMs &&
+           !IsComplete() &&
+           !heap()->mark_compact_collector()->marking_deque()->IsEmpty());
   return remaining_time_in_ms;
 }
 
 
 void IncrementalMarking::OldSpaceStep(intptr_t allocated) {
   if (IsStopped() && ShouldActivateEvenWithoutIdleNotification()) {
     heap()->StartIncrementalMarking(Heap::kNoGCFlags, kNoGCCallbackFlags,
                                     "old space step");
   } else {
     Step(allocated * kFastMarking / kInitialMarkingSpeed, GC_VIA_STACK_GUARD);
@@ skipping 191 matching lines @@
 void IncrementalMarking::IncrementIdleMarkingDelayCounter() {
   idle_marking_delay_counter_++;
 }
 
 
 void IncrementalMarking::ClearIdleMarkingDelayCounter() {
   idle_marking_delay_counter_ = 0;
 }
 }  // namespace internal
 }  // namespace v8