Remove special handling of background idle notification in memory reducer.

test/unittests/heap/memory-reducer-unittest.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 <limits>
 
 #include "src/flags.h"
 #include "src/heap/memory-reducer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 30 matching lines @@
 MemoryReducer::Event MarkCompactEventGarbageLeft(double time_ms) {
   return MarkCompactEvent(time_ms, true);
 }
 
 
 MemoryReducer::Event MarkCompactEventNoGarbageLeft(double time_ms) {
   return MarkCompactEvent(time_ms, false);
 }
 
 
-MemoryReducer::Event TimerEvent(double time_ms, bool low_allocation_rate,
+MemoryReducer::Event TimerEvent(double time_ms,
+                                bool should_start_incremental_gc,
                                 bool can_start_incremental_gc) {
   MemoryReducer::Event event;
   event.type = MemoryReducer::kTimer;
   event.time_ms = time_ms;
-  event.low_allocation_rate = low_allocation_rate;
+  event.should_start_incremental_gc = should_start_incremental_gc;
   event.can_start_incremental_gc = can_start_incremental_gc;
   return event;
 }
 
 
 MemoryReducer::Event TimerEventLowAllocationRate(double time_ms) {
   return TimerEvent(time_ms, true, true);
 }
 
 
 MemoryReducer::Event TimerEventHighAllocationRate(double time_ms) {
   return TimerEvent(time_ms, false, true);
 }
 
 
 MemoryReducer::Event TimerEventPendingGC(double time_ms) {
   return TimerEvent(time_ms, true, false);
 }
 
 
 MemoryReducer::Event ContextDisposedEvent(double time_ms) {
   MemoryReducer::Event event;
   event.type = MemoryReducer::kContextDisposed;
   event.time_ms = time_ms;
   return event;
 }
 
 
-MemoryReducer::Event BackgroundIdleNotificationEvent(
-    double time_ms, bool can_start_incremental_gc = true) {
-  MemoryReducer::Event event;
-  event.type = MemoryReducer::kBackgroundIdleNotification;
-  event.time_ms = time_ms;
-  event.can_start_incremental_gc = can_start_incremental_gc;
-  return event;
-}
-
-
 TEST(MemoryReducer, FromDoneToDone) {
   MemoryReducer::State state0(DoneState()), state1(DoneState());
 
   state1 = MemoryReducer::Step(state0, TimerEventLowAllocationRate(0));
   EXPECT_EQ(MemoryReducer::kDone, state1.action);
 
   state1 = MemoryReducer::Step(state0, TimerEventHighAllocationRate(0));
   EXPECT_EQ(MemoryReducer::kDone, state1.action);
 
   state1 = MemoryReducer::Step(state0, TimerEventPendingGC(0));
   EXPECT_EQ(MemoryReducer::kDone, state1.action);
-
-  state1 = MemoryReducer::Step(state0, BackgroundIdleNotificationEvent(0));
-  EXPECT_EQ(MemoryReducer::kDone, state1.action);
 }
 
 
 TEST(MemoryReducer, FromDoneToWait) {
   if (!FLAG_incremental_marking) return;
 
   MemoryReducer::State state0(DoneState()), state1(DoneState());
 
   state1 = MemoryReducer::Step(state0, MarkCompactEventGarbageLeft(2));
   EXPECT_EQ(MemoryReducer::kWait, state1.action);
@@ skipping 46 matching lines @@
   EXPECT_EQ(2000 + MemoryReducer::kLongDelayMs, state1.next_gc_start_ms);
   EXPECT_EQ(state0.started_gcs, state1.started_gcs);
   EXPECT_EQ(2000, state1.last_gc_time_ms);
 
   state1 = MemoryReducer::Step(state0, MarkCompactEventNoGarbageLeft(2000));
   EXPECT_EQ(MemoryReducer::kWait, state1.action);
   EXPECT_EQ(2000 + MemoryReducer::kLongDelayMs, state1.next_gc_start_ms);
   EXPECT_EQ(state0.started_gcs, state1.started_gcs);
   EXPECT_EQ(2000, state1.last_gc_time_ms);
 
-  state1 = MemoryReducer::Step(state0, BackgroundIdleNotificationEvent(2000));
-  EXPECT_EQ(MemoryReducer::kWait, state1.action);
-  EXPECT_EQ(2000 + MemoryReducer::kLongDelayMs, state1.next_gc_start_ms);
-  EXPECT_EQ(state0.started_gcs + 1, state1.started_gcs);
-
-  state1 =
-      MemoryReducer::Step(state0, BackgroundIdleNotificationEvent(2000, false));
-  EXPECT_EQ(MemoryReducer::kWait, state1.action);
-  EXPECT_EQ(state0.next_gc_start_ms, state1.next_gc_start_ms);
-  EXPECT_EQ(state0.started_gcs, state1.started_gcs);
-
   state0.last_gc_time_ms = 0;
   state1 = MemoryReducer::Step(
       state0,
       TimerEventHighAllocationRate(MemoryReducer::kWatchdogDelayMs + 1));
   EXPECT_EQ(MemoryReducer::kWait, state1.action);
   EXPECT_EQ(MemoryReducer::kWatchdogDelayMs + 1 + MemoryReducer::kLongDelayMs,
             state1.next_gc_start_ms);
   EXPECT_EQ(state0.started_gcs, state1.started_gcs);
   EXPECT_EQ(state0.last_gc_time_ms, state1.last_gc_time_ms);
 
   state0.last_gc_time_ms = 1;
   state1 = MemoryReducer::Step(state0, TimerEventHighAllocationRate(2000));
   EXPECT_EQ(MemoryReducer::kWait, state1.action);
   EXPECT_EQ(2000 + MemoryReducer::kLongDelayMs, state1.next_gc_start_ms);
   EXPECT_EQ(state0.started_gcs, state1.started_gcs);
   EXPECT_EQ(state0.last_gc_time_ms, state1.last_gc_time_ms);
-
-  state0.started_gcs = MemoryReducer::kMaxNumberOfGCs;
-  state1 = MemoryReducer::Step(state0, BackgroundIdleNotificationEvent(2000));
-  EXPECT_EQ(MemoryReducer::kWait, state1.action);
-  EXPECT_EQ(state0.next_gc_start_ms, state1.next_gc_start_ms);
-  EXPECT_EQ(state0.started_gcs, state1.started_gcs);
 }
 
 
 TEST(MemoryReducer, FromWaitToRun) {
   if (!FLAG_incremental_marking) return;
 
   MemoryReducer::State state0(WaitState(0, 1000.0)), state1(DoneState());
 
   state1 = MemoryReducer::Step(
       state0, TimerEventLowAllocationRate(state0.next_gc_start_ms + 1));
@@ skipping 104 matching lines @@
 
   state1 = MemoryReducer::Step(state0, MarkCompactEventNoGarbageLeft(2000));
   EXPECT_EQ(MemoryReducer::kWait, state1.action);
   EXPECT_EQ(2000 + MemoryReducer::kShortDelayMs, state1.next_gc_start_ms);
   EXPECT_EQ(state0.started_gcs, state1.started_gcs);
   EXPECT_EQ(2000, state1.last_gc_time_ms);
 }
 
 }  // namespace internal
 }  // namespace v8