Revert "Add finalize sweeping event to GCIdleTimeHandler."

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

 // 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.
 
 #ifndef V8_HEAP_GC_IDLE_TIME_HANDLER_H_
 #define V8_HEAP_GC_IDLE_TIME_HANDLER_H_
 
 #include "src/globals.h"
 
 namespace v8 {
 namespace internal {
 
 enum GCIdleTimeActionType {
   DO_NOTHING,
   DO_INCREMENTAL_MARKING,
   DO_SCAVENGE,
-  DO_FULL_GC,
-  DO_FINALIZE_SWEEPING
+  DO_FULL_GC
 };
 
 
 class GCIdleTimeAction {
  public:
   static GCIdleTimeAction Nothing() {
     GCIdleTimeAction result;
     result.type = DO_NOTHING;
     result.parameter = 0;
     return result;
   }
-
   static GCIdleTimeAction IncrementalMarking(intptr_t step_size) {
     GCIdleTimeAction result;
     result.type = DO_INCREMENTAL_MARKING;
     result.parameter = step_size;
     return result;
   }
-
   static GCIdleTimeAction Scavenge() {
     GCIdleTimeAction result;
     result.type = DO_SCAVENGE;
     result.parameter = 0;
     return result;
   }
-
   static GCIdleTimeAction FullGC() {
     GCIdleTimeAction result;
     result.type = DO_FULL_GC;
     result.parameter = 0;
     return result;
   }
 
-  static GCIdleTimeAction FinalizeSweeping() {
-    GCIdleTimeAction result;
-    result.type = DO_FINALIZE_SWEEPING;
-    result.parameter = 0;
-    return result;
-  }
-
   GCIdleTimeActionType type;
   intptr_t parameter;
 };
 
 
 class GCTracer;
 
 // The idle time handler makes decisions about which garbage collection
 // operations are executing during IdleNotification.
 class GCIdleTimeHandler {
  public:
   // If we haven't recorded any incremental marking events yet, we carefully
   // mark with a conservative lower bound for the marking speed.
   static const size_t kInitialConservativeMarkingSpeed = 100 * KB;
 
   // Maximum marking step size returned by EstimateMarkingStepSize.
   static const size_t kMaximumMarkingStepSize = 700 * MB;
 
   // We have to make sure that we finish the IdleNotification before
   // idle_time_in_ms. Hence, we conservatively prune our workload estimate.
   static const double kConservativeTimeRatio;
 
   // If we haven't recorded any mark-compact events yet, we use
   // conservative lower bound for the mark-compact speed.
   static const size_t kInitialConservativeMarkCompactSpeed = 2 * MB;
 
   // Maximum mark-compact time returned by EstimateMarkCompactTime.
-  static const size_t kMaxMarkCompactTimeInMs = 1000000;
-
-  // Minimum time to finalize sweeping phase. The main thread may wait for
-  // sweeper threads.
-  static const size_t kMinTimeForFinalizeSweeping = 100;
+  static const size_t kMaxMarkCompactTimeInMs;
 
   struct HeapState {
     int contexts_disposed;
     size_t size_of_objects;
     bool incremental_marking_stopped;
     bool can_start_incremental_marking;
-    bool sweeping_in_progress;
   };
 
   GCIdleTimeHandler()
       : mark_compacts_since_idle_round_started_(0),
         scavenges_since_last_idle_round_(0) {}
 
-  GCIdleTimeAction Compute(size_t idle_time_in_ms, HeapState heap_state,
+  GCIdleTimeAction Compute(int idle_time_in_ms, HeapState heap_state,
                            GCTracer* gc_tracer);
 
   void NotifyIdleMarkCompact() {
     if (mark_compacts_since_idle_round_started_ < kMaxMarkCompactsInIdleRound) {
       ++mark_compacts_since_idle_round_started_;
       if (mark_compacts_since_idle_round_started_ ==
           kMaxMarkCompactsInIdleRound) {
         scavenges_since_last_idle_round_ = 0;
       }
     }
@@ skipping 22 matching lines @@
   int mark_compacts_since_idle_round_started_;
   int scavenges_since_last_idle_round_;
 
   DISALLOW_COPY_AND_ASSIGN(GCIdleTimeHandler);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HEAP_GC_IDLE_TIME_HANDLER_H_