Revert "Distinguish beween final incremental mark-compact and full mark-compact event in IdleNotifi…

src/heap/gc-tracer.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_TRACER_H_
 #define V8_HEAP_GC_TRACER_H_
 
 #include "src/base/platform/platform.h"
 
 namespace v8 {
@@ skipping 142 matching lines @@
 
     explicit ContextDisposalEvent(double time);
 
     // Time when context disposal event happened.
     double time_;
   };
 
 
   class Event {
    public:
-    enum Type {
-      SCAVENGER = 0,
-      MARK_COMPACTOR = 1,
-      INCREMENTAL_MARK_COMPACTOR = 2,
-      START = 3
-    };
+    enum Type { SCAVENGER = 0, MARK_COMPACTOR = 1, START = 2 };
 
     // Default constructor leaves the event uninitialized.
     Event() {}
 
     Event(Type type, const char* gc_reason, const char* collector_reason);
 
     // Returns a string describing the event type.
     const char* TypeName(bool short_name) const;
 
     // Type of event
@@ skipping 30 matching lines @@
 
     // Size of new space objects in constructor.
     intptr_t new_space_object_size;
 
     // Number of incremental marking steps since creation of tracer.
     // (value at start of event)
     int cumulative_incremental_marking_steps;
 
     // Incremental marking steps since
     // - last event for SCAVENGER events
-    // - last INCREMENTAL_MARK_COMPACTOR event for INCREMENTAL_MARK_COMPACTOR
-    // events
+    // - last MARK_COMPACTOR event for MARK_COMPACTOR events
     int incremental_marking_steps;
 
     // Bytes marked since creation of tracer (value at start of event).
     intptr_t cumulative_incremental_marking_bytes;
 
     // Bytes marked since
     // - last event for SCAVENGER events
-    // - last INCREMENTAL_MARK_COMPACTOR event for INCREMENTAL_MARK_COMPACTOR
-    // events
+    // - last MARK_COMPACTOR event for MARK_COMPACTOR events
     intptr_t incremental_marking_bytes;
 
     // Cumulative duration of incremental marking steps since creation of
     // tracer. (value at start of event)
     double cumulative_incremental_marking_duration;
 
     // Duration of incremental marking steps since
     // - last event for SCAVENGER events
-    // - last INCREMENTAL_MARK_COMPACTOR event for INCREMENTAL_MARK_COMPACTOR
-    // events
+    // - last MARK_COMPACTOR event for MARK_COMPACTOR events
     double incremental_marking_duration;
 
     // Cumulative pure duration of incremental marking steps since creation of
     // tracer. (value at start of event)
     double cumulative_pure_incremental_marking_duration;
 
     // Duration of pure incremental marking steps since
     // - last event for SCAVENGER events
-    // - last INCREMENTAL_MARK_COMPACTOR event for INCREMENTAL_MARK_COMPACTOR
-    // events
+    // - last MARK_COMPACTOR event for MARK_COMPACTOR events
     double pure_incremental_marking_duration;
 
     // Longest incremental marking step since start of marking.
     // (value at start of event)
     double longest_incremental_marking_step;
 
     // Amounts of time spent in different scopes during GC.
     double scopes[Scope::NUMBER_OF_SCOPES];
   };
 
@@ skipping 58 matching lines @@
   double MeanMarkCompactorDuration() const {
     return MeanDuration(mark_compactor_events_);
   }
 
   // Compute the max duration of the last mark compactor events. Return 0 if no
   // events have been recorded.
   double MaxMarkCompactorDuration() const {
     return MaxDuration(mark_compactor_events_);
   }
 
-  // Compute the mean duration of the last incremental mark compactor
-  // events. Returns 0 if no events have been recorded.
-  double MeanIncrementalMarkCompactorDuration() const {
-    return MeanDuration(incremental_mark_compactor_events_);
-  }
-
   // Compute the mean step duration of the last incremental marking round.
   // Returns 0 if no incremental marking round has been completed.
   double MeanIncrementalMarkingDuration() const;
 
   // Compute the max step duration of the last incremental marking round.
   // Returns 0 if no incremental marking round has been completed.
   double MaxIncrementalMarkingDuration() const;
 
   // Compute the average incremental marking speed in bytes/millisecond.
   // Returns 0 if no events have been recorded.
   intptr_t IncrementalMarkingSpeedInBytesPerMillisecond() const;
 
   // Compute the average scavenge speed in bytes/millisecond.
   // Returns 0 if no events have been recorded.
   intptr_t ScavengeSpeedInBytesPerMillisecond() const;
 
-  // Compute the average mark-sweep speed in bytes/millisecond.
+  // Compute the max mark-sweep speed in bytes/millisecond.
   // Returns 0 if no events have been recorded.
   intptr_t MarkCompactSpeedInBytesPerMillisecond() const;
 
-  // Compute the average incremental mark-sweep finalize speed in
-  // bytes/millisecond.
-  // Returns 0 if no events have been recorded.
-  intptr_t FinalIncrementalMarkCompactSpeedInBytesPerMillisecond() const;
-
   // Allocation throughput in the new space in bytes/millisecond.
   // Returns 0 if no events have been recorded.
   intptr_t NewSpaceAllocationThroughputInBytesPerMillisecond() const;
 
   // Computes the context disposal rate in milliseconds. It takes the time
   // frame of the first recorded context disposal to the current time and
   // divides it by the number of recorded events.
   // Returns 0 if no events have been recorded.
   double ContextDisposalRateInMilliseconds() const;
 
  private:
   // Print one detailed trace line in name=value format.
   // TODO(ernstm): Move to Heap.
   void PrintNVP() const;
 
   // Print one trace line.
   // TODO(ernstm): Move to Heap.
   void Print() const;
 
   // Compute the mean duration of the events in the given ring buffer.
   double MeanDuration(const EventBuffer& events) const;
 
   // Compute the max duration of the events in the given ring buffer.
   double MaxDuration(const EventBuffer& events) const;
 
-  void ClearMarkCompactStatistics() {
-    cumulative_incremental_marking_steps_ = 0;
-    cumulative_incremental_marking_bytes_ = 0;
-    cumulative_incremental_marking_duration_ = 0;
-    cumulative_pure_incremental_marking_duration_ = 0;
-    longest_incremental_marking_step_ = 0;
-    cumulative_marking_duration_ = 0;
-    cumulative_sweeping_duration_ = 0;
-  }
-
   // Pointer to the heap that owns this tracer.
   Heap* heap_;
 
   // Current tracer event. Populated during Start/Stop cycle. Valid after Stop()
   // has returned.
   Event current_;
 
   // Previous tracer event.
   Event previous_;
 
-  // Previous INCREMENTAL_MARK_COMPACTOR event.
-  Event previous_incremental_mark_compactor_event_;
+  // Previous MARK_COMPACTOR event.
+  Event previous_mark_compactor_event_;
 
   // RingBuffers for SCAVENGER events.
   EventBuffer scavenger_events_;
 
   // RingBuffers for MARK_COMPACTOR events.
   EventBuffer mark_compactor_events_;
 
-  // RingBuffers for INCREMENTAL_MARK_COMPACTOR events.
-  EventBuffer incremental_mark_compactor_events_;
-
   // RingBuffer for allocation events.
   AllocationEventBuffer allocation_events_;
 
   ContextDisposalEventBuffer context_disposal_events_;
 
   // Cumulative number of incremental marking steps since creation of tracer.
   int cumulative_incremental_marking_steps_;
 
   // Cumulative size of incremental marking steps (in bytes) since creation of
   // tracer.
@@ skipping 25 matching lines @@
   // Holds the new space top pointer recorded at the end of the last garbage
   // collection.
   intptr_t new_space_top_after_gc_;
 
   DISALLOW_COPY_AND_ASSIGN(GCTracer);
 };
 }
 }  // namespace v8::internal
 
 #endif  // V8_HEAP_GC_TRACER_H_