| Index: test/unittests/heap/gc-idle-time-handler-unittest.cc
|
| diff --git a/test/unittests/heap/gc-idle-time-handler-unittest.cc b/test/unittests/heap/gc-idle-time-handler-unittest.cc
|
| index 868262bcb38152d4bdffbf84f83dbe820ce2a926..67ae4e05ce0d83bf43e2e96363ddd68512f8a747 100644
|
| --- a/test/unittests/heap/gc-idle-time-handler-unittest.cc
|
| +++ b/test/unittests/heap/gc-idle-time-handler-unittest.cc
|
| @@ -38,12 +38,63 @@ class GCIdleTimeHandlerTest : public ::testing::Test {
|
| return result;
|
| }
|
|
|
| + void TransitionToReduceMemoryMode(
|
| + const GCIdleTimeHandler::HeapState& heap_state) {
|
| + handler()->NotifyScavenge();
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceLatency, handler()->mode());
|
| + double idle_time_ms = GCIdleTimeHandler::kMinLongIdleTime;
|
| + int limit = GCIdleTimeHandler::kLongIdleNotificationsBeforeMutatorIsIdle;
|
| + bool incremental = !heap_state.incremental_marking_stopped ||
|
| + heap_state.can_start_incremental_marking;
|
| + for (int i = 0; i < limit; i++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(incremental ? DO_INCREMENTAL_MARKING : DO_NOTHING, action.type);
|
| + }
|
| + handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceMemory, handler()->mode());
|
| + }
|
| +
|
| + void TransitionToDoneMode(const GCIdleTimeHandler::HeapState& heap_state,
|
| + double idle_time_ms,
|
| + GCIdleTimeActionType expected) {
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceMemory, handler()->mode());
|
| + int limit = GCIdleTimeHandler::kMaxIdleMarkCompacts;
|
| + for (int i = 0; i < limit; i++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(expected, action.type);
|
| + EXPECT_TRUE(action.reduce_memory);
|
| + handler()->NotifyMarkCompact();
|
| + handler()->NotifyIdleMarkCompact();
|
| + }
|
| + handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(GCIdleTimeHandler::kDone, handler()->mode());
|
| + }
|
| +
|
| + void TransitionToReduceLatencyMode(
|
| + const GCIdleTimeHandler::HeapState& heap_state) {
|
| + EXPECT_EQ(GCIdleTimeHandler::kDone, handler()->mode());
|
| + int limit = GCIdleTimeHandler::kGCsBeforeMutatorIsActive;
|
| + double idle_time_ms = GCIdleTimeHandler::kMinLongIdleTime;
|
| + for (int i = 0; i < limit; i++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DONE, action.type);
|
| + if (i % 2 == 0) {
|
| + handler()->NotifyScavenge();
|
| + } else {
|
| + handler()->NotifyMarkCompact();
|
| + }
|
| + }
|
| + handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceLatency, handler()->mode());
|
| + }
|
| +
|
| static const size_t kSizeOfObjects = 100 * MB;
|
| static const size_t kMarkCompactSpeed = 200 * KB;
|
| static const size_t kMarkingSpeed = 200 * KB;
|
| static const size_t kScavengeSpeed = 100 * KB;
|
| static const size_t kNewSpaceCapacity = 1 * MB;
|
| static const size_t kNewSpaceAllocationThroughput = 10 * KB;
|
| + static const int kMaxNotifications = 100;
|
|
|
| private:
|
| GCIdleTimeHandler handler_;
|
| @@ -113,9 +164,9 @@ TEST(GCIdleTimeHandler, EstimateMarkCompactTimeMax) {
|
|
|
| TEST_F(GCIdleTimeHandlerTest, DoScavengeEmptyNewSpace) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - int idle_time_in_ms = 16;
|
| + int idle_time_ms = 16;
|
| EXPECT_FALSE(GCIdleTimeHandler::ShouldDoScavenge(
|
| - idle_time_in_ms, heap_state.new_space_capacity,
|
| + idle_time_ms, heap_state.new_space_capacity,
|
| heap_state.used_new_space_size, heap_state.scavenge_speed_in_bytes_per_ms,
|
| heap_state.new_space_allocation_throughput_in_bytes_per_ms));
|
| }
|
| @@ -124,9 +175,9 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeEmptyNewSpace) {
|
| TEST_F(GCIdleTimeHandlerTest, DoScavengeFullNewSpace) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| heap_state.used_new_space_size = kNewSpaceCapacity;
|
| - int idle_time_in_ms = 16;
|
| + int idle_time_ms = 16;
|
| EXPECT_TRUE(GCIdleTimeHandler::ShouldDoScavenge(
|
| - idle_time_in_ms, heap_state.new_space_capacity,
|
| + idle_time_ms, heap_state.new_space_capacity,
|
| heap_state.used_new_space_size, heap_state.scavenge_speed_in_bytes_per_ms,
|
| heap_state.new_space_allocation_throughput_in_bytes_per_ms));
|
| }
|
| @@ -136,9 +187,9 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeUnknownScavengeSpeed) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| heap_state.used_new_space_size = kNewSpaceCapacity;
|
| heap_state.scavenge_speed_in_bytes_per_ms = 0;
|
| - int idle_time_in_ms = 8;
|
| + int idle_time_ms = 8;
|
| EXPECT_FALSE(GCIdleTimeHandler::ShouldDoScavenge(
|
| - idle_time_in_ms, heap_state.new_space_capacity,
|
| + idle_time_ms, heap_state.new_space_capacity,
|
| heap_state.used_new_space_size, heap_state.scavenge_speed_in_bytes_per_ms,
|
| heap_state.new_space_allocation_throughput_in_bytes_per_ms));
|
| }
|
| @@ -148,9 +199,9 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeLowScavengeSpeed) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| heap_state.used_new_space_size = kNewSpaceCapacity;
|
| heap_state.scavenge_speed_in_bytes_per_ms = 1 * KB;
|
| - int idle_time_in_ms = 16;
|
| + int idle_time_ms = 16;
|
| EXPECT_FALSE(GCIdleTimeHandler::ShouldDoScavenge(
|
| - idle_time_in_ms, heap_state.new_space_capacity,
|
| + idle_time_ms, heap_state.new_space_capacity,
|
| heap_state.used_new_space_size, heap_state.scavenge_speed_in_bytes_per_ms,
|
| heap_state.new_space_allocation_throughput_in_bytes_per_ms));
|
| }
|
| @@ -160,38 +211,38 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeHighScavengeSpeed) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| heap_state.used_new_space_size = kNewSpaceCapacity;
|
| heap_state.scavenge_speed_in_bytes_per_ms = kNewSpaceCapacity;
|
| - int idle_time_in_ms = 16;
|
| + int idle_time_ms = 16;
|
| EXPECT_TRUE(GCIdleTimeHandler::ShouldDoScavenge(
|
| - idle_time_in_ms, heap_state.new_space_capacity,
|
| + idle_time_ms, heap_state.new_space_capacity,
|
| heap_state.used_new_space_size, heap_state.scavenge_speed_in_bytes_per_ms,
|
| heap_state.new_space_allocation_throughput_in_bytes_per_ms));
|
| }
|
|
|
|
|
| TEST_F(GCIdleTimeHandlerTest, ShouldDoMarkCompact) {
|
| - size_t idle_time_in_ms = GCIdleTimeHandler::kMaxScheduledIdleTime;
|
| - EXPECT_TRUE(GCIdleTimeHandler::ShouldDoMarkCompact(idle_time_in_ms, 0, 0));
|
| + size_t idle_time_ms = GCIdleTimeHandler::kMaxScheduledIdleTime;
|
| + EXPECT_TRUE(GCIdleTimeHandler::ShouldDoMarkCompact(idle_time_ms, 0, 0));
|
| }
|
|
|
|
|
| TEST_F(GCIdleTimeHandlerTest, DontDoMarkCompact) {
|
| - size_t idle_time_in_ms = 1;
|
| + size_t idle_time_ms = 1;
|
| EXPECT_FALSE(GCIdleTimeHandler::ShouldDoMarkCompact(
|
| - idle_time_in_ms, kSizeOfObjects, kMarkingSpeed));
|
| + idle_time_ms, kSizeOfObjects, kMarkingSpeed));
|
| }
|
|
|
|
|
| TEST_F(GCIdleTimeHandlerTest, ShouldDoFinalIncrementalMarkCompact) {
|
| - size_t idle_time_in_ms = 16;
|
| + size_t idle_time_ms = 16;
|
| EXPECT_TRUE(GCIdleTimeHandler::ShouldDoFinalIncrementalMarkCompact(
|
| - idle_time_in_ms, 0, 0));
|
| + idle_time_ms, 0, 0));
|
| }
|
|
|
|
|
| TEST_F(GCIdleTimeHandlerTest, DontDoFinalIncrementalMarkCompact) {
|
| - size_t idle_time_in_ms = 1;
|
| + size_t idle_time_ms = 1;
|
| EXPECT_FALSE(GCIdleTimeHandler::ShouldDoFinalIncrementalMarkCompact(
|
| - idle_time_in_ms, kSizeOfObjects, kMarkingSpeed));
|
| + idle_time_ms, kSizeOfObjects, kMarkingSpeed));
|
| }
|
|
|
|
|
| @@ -200,8 +251,11 @@ TEST_F(GCIdleTimeHandlerTest, ContextDisposeLowRate) {
|
| heap_state.contexts_disposed = 1;
|
| heap_state.incremental_marking_stopped = true;
|
| double idle_time_ms = 0;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_NOTHING, action.type);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_NOTHING, action.type);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -212,22 +266,11 @@ TEST_F(GCIdleTimeHandlerTest, ContextDisposeHighRate) {
|
| GCIdleTimeHandler::kHighContextDisposalRate - 1;
|
| heap_state.incremental_marking_stopped = true;
|
| double idle_time_ms = 0;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_FULL_GC, action.type);
|
| -}
|
| -
|
| -
|
| -TEST_F(GCIdleTimeHandlerTest, AfterContextDisposeLargeIdleTime) {
|
| - GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - heap_state.contexts_disposed = 1;
|
| - heap_state.contexts_disposal_rate = 1.0;
|
| - heap_state.incremental_marking_stopped = true;
|
| - heap_state.can_start_incremental_marking = false;
|
| - size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
|
| - double idle_time_ms =
|
| - static_cast<double>((heap_state.size_of_objects + speed - 1) / speed);
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_FULL_GC, action.type);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_FULL_GC, action.type);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -237,8 +280,11 @@ TEST_F(GCIdleTimeHandlerTest, AfterContextDisposeZeroIdleTime) {
|
| heap_state.contexts_disposal_rate = 1.0;
|
| heap_state.incremental_marking_stopped = true;
|
| double idle_time_ms = 0;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_FULL_GC, action.type);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_FULL_GC, action.type);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -250,8 +296,11 @@ TEST_F(GCIdleTimeHandlerTest, AfterContextDisposeSmallIdleTime1) {
|
| size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
|
| double idle_time_ms =
|
| static_cast<double>(heap_state.size_of_objects / speed - 1);
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -262,8 +311,11 @@ TEST_F(GCIdleTimeHandlerTest, AfterContextDisposeSmallIdleTime2) {
|
| size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
|
| double idle_time_ms =
|
| static_cast<double>(heap_state.size_of_objects / speed - 1);
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -271,11 +323,14 @@ TEST_F(GCIdleTimeHandlerTest, IncrementalMarking1) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| size_t speed = heap_state.incremental_marking_speed_in_bytes_per_ms;
|
| double idle_time_ms = 10;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| - EXPECT_GT(speed * static_cast<size_t>(idle_time_ms),
|
| - static_cast<size_t>(action.parameter));
|
| - EXPECT_LT(0, action.parameter);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_GT(speed * static_cast<size_t>(idle_time_ms),
|
| + static_cast<size_t>(action.parameter));
|
| + EXPECT_LT(0, action.parameter);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -284,11 +339,14 @@ TEST_F(GCIdleTimeHandlerTest, IncrementalMarking2) {
|
| heap_state.incremental_marking_stopped = true;
|
| size_t speed = heap_state.incremental_marking_speed_in_bytes_per_ms;
|
| double idle_time_ms = 10;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| - EXPECT_GT(speed * static_cast<size_t>(idle_time_ms),
|
| - static_cast<size_t>(action.parameter));
|
| - EXPECT_LT(0, action.parameter);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_GT(speed * static_cast<size_t>(idle_time_ms),
|
| + static_cast<size_t>(action.parameter));
|
| + EXPECT_LT(0, action.parameter);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -301,6 +359,9 @@ TEST_F(GCIdleTimeHandlerTest, NotEnoughTime) {
|
| static_cast<double>(heap_state.size_of_objects / speed - 1);
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DO_NOTHING, action.type);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| }
|
|
|
|
|
| @@ -308,11 +369,16 @@ TEST_F(GCIdleTimeHandlerTest, FinalizeSweeping) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| heap_state.incremental_marking_stopped = true;
|
| heap_state.can_start_incremental_marking = false;
|
| - heap_state.sweeping_in_progress = true;
|
| - heap_state.sweeping_completed = true;
|
| - double idle_time_ms = 10.0;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_FINALIZE_SWEEPING, action.type);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + heap_state.sweeping_in_progress = true;
|
| + heap_state.sweeping_completed = true;
|
| + double idle_time_ms = 10.0;
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_FINALIZE_SWEEPING, action.type);
|
| + heap_state.sweeping_in_progress = false;
|
| + heap_state.sweeping_completed = false;
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -320,11 +386,52 @@ TEST_F(GCIdleTimeHandlerTest, CannotFinalizeSweeping) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| heap_state.incremental_marking_stopped = true;
|
| heap_state.can_start_incremental_marking = false;
|
| - heap_state.sweeping_in_progress = true;
|
| - heap_state.sweeping_completed = false;
|
| - double idle_time_ms = 10.0;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_NOTHING, action.type);
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + heap_state.sweeping_in_progress = true;
|
| + heap_state.sweeping_completed = false;
|
| + double idle_time_ms = 10.0;
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_NOTHING, action.type);
|
| + heap_state.sweeping_in_progress = false;
|
| + heap_state.sweeping_completed = false;
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| +}
|
| +
|
| +
|
| +TEST_F(GCIdleTimeHandlerTest, Scavenge) {
|
| + GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| + int idle_time_ms = 10;
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + heap_state.used_new_space_size =
|
| + heap_state.new_space_capacity -
|
| + (kNewSpaceAllocationThroughput * idle_time_ms);
|
| + GCIdleTimeAction action =
|
| + handler()->Compute(static_cast<double>(idle_time_ms), heap_state);
|
| + EXPECT_EQ(DO_SCAVENGE, action.type);
|
| + heap_state.used_new_space_size = 0;
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| +}
|
| +
|
| +
|
| +TEST_F(GCIdleTimeHandlerTest, ScavengeAndDone) {
|
| + GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| + int idle_time_ms = 10;
|
| + heap_state.can_start_incremental_marking = false;
|
| + heap_state.incremental_marking_stopped = true;
|
| + for (int mode = 0; mode < 1; mode++) {
|
| + heap_state.used_new_space_size =
|
| + heap_state.new_space_capacity -
|
| + (kNewSpaceAllocationThroughput * idle_time_ms);
|
| + GCIdleTimeAction action =
|
| + handler()->Compute(static_cast<double>(idle_time_ms), heap_state);
|
| + EXPECT_EQ(DO_SCAVENGE, action.type);
|
| + heap_state.used_new_space_size = 0;
|
| + action = handler()->Compute(static_cast<double>(idle_time_ms), heap_state);
|
| + EXPECT_EQ(DO_NOTHING, action.type);
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + }
|
| }
|
|
|
|
|
| @@ -332,30 +439,41 @@ TEST_F(GCIdleTimeHandlerTest, StopEventually1) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| heap_state.incremental_marking_stopped = true;
|
| heap_state.can_start_incremental_marking = false;
|
| + double idle_time_ms = GCIdleTimeHandler::kMinLongIdleTime;
|
| + bool stopped = false;
|
| + for (int i = 0; i < kMaxNotifications && !stopped; i++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + if (action.type == DO_INCREMENTAL_MARKING || action.type == DO_FULL_GC) {
|
| + handler()->NotifyMarkCompact();
|
| + handler()->NotifyIdleMarkCompact();
|
| + }
|
| + if (action.type == DONE) stopped = true;
|
| + }
|
| + EXPECT_TRUE(stopped);
|
| +}
|
| +
|
| +
|
| +TEST_F(GCIdleTimeHandlerTest, StopEventually2) {
|
| + GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| + heap_state.incremental_marking_stopped = true;
|
| + heap_state.can_start_incremental_marking = false;
|
| size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
|
| double idle_time_ms =
|
| static_cast<double>(heap_state.size_of_objects / speed + 1);
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxMarkCompactsInIdleRound; i++) {
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_FULL_GC, action.type);
|
| - handler()->NotifyIdleMarkCompact();
|
| - }
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + TransitionToDoneMode(heap_state, idle_time_ms, DO_FULL_GC);
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DONE, action.type);
|
| }
|
|
|
|
|
| -TEST_F(GCIdleTimeHandlerTest, StopEventually2) {
|
| +TEST_F(GCIdleTimeHandlerTest, StopEventually3) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - double idle_time_ms = 10;
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxMarkCompactsInIdleRound; i++) {
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| - // In this case we emulate incremental marking steps that finish with a
|
| - // full gc.
|
| - handler()->NotifyIdleMarkCompact();
|
| - }
|
| + heap_state.incremental_marking_stopped = true;
|
| heap_state.can_start_incremental_marking = false;
|
| + double idle_time_ms = 10;
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + TransitionToDoneMode(heap_state, idle_time_ms, DO_INCREMENTAL_MARKING);
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DONE, action.type);
|
| }
|
| @@ -368,153 +486,144 @@ TEST_F(GCIdleTimeHandlerTest, ContinueAfterStop1) {
|
| size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
|
| double idle_time_ms =
|
| static_cast<double>(heap_state.size_of_objects / speed + 1);
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxMarkCompactsInIdleRound; i++) {
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_FULL_GC, action.type);
|
| - handler()->NotifyIdleMarkCompact();
|
| - }
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + TransitionToDoneMode(heap_state, idle_time_ms, DO_FULL_GC);
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DONE, action.type);
|
| - // Emulate mutator work.
|
| - for (int i = 0; i < GCIdleTimeHandler::kIdleScavengeThreshold; i++) {
|
| - handler()->NotifyScavenge();
|
| - }
|
| + TransitionToReduceLatencyMode(heap_state);
|
| + heap_state.can_start_incremental_marking = true;
|
| action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_FULL_GC, action.type);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_FALSE(action.reduce_memory);
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceLatency, handler()->mode());
|
| }
|
|
|
|
|
| TEST_F(GCIdleTimeHandlerTest, ContinueAfterStop2) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - double idle_time_ms = 10;
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxMarkCompactsInIdleRound; i++) {
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - if (action.type == DONE) break;
|
| - EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| - // In this case we try to emulate incremental marking steps the finish with
|
| - // a full gc.
|
| - handler()->NotifyIdleMarkCompact();
|
| - }
|
| + heap_state.incremental_marking_stopped = true;
|
| heap_state.can_start_incremental_marking = false;
|
| + double idle_time_ms = 10;
|
| + TransitionToReduceMemoryMode(heap_state);
|
| + TransitionToDoneMode(heap_state, idle_time_ms, DO_INCREMENTAL_MARKING);
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DONE, action.type);
|
| - // Emulate mutator work.
|
| - for (int i = 0; i < GCIdleTimeHandler::kIdleScavengeThreshold; i++) {
|
| - handler()->NotifyScavenge();
|
| - }
|
| + TransitionToReduceLatencyMode(heap_state);
|
| heap_state.can_start_incremental_marking = true;
|
| action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_FALSE(action.reduce_memory);
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceLatency, handler()->mode());
|
| }
|
|
|
|
|
| -TEST_F(GCIdleTimeHandlerTest, Scavenge) {
|
| +TEST_F(GCIdleTimeHandlerTest, ZeroIdleTimeNothingToDo) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - int idle_time_ms = 10;
|
| - heap_state.used_new_space_size =
|
| - heap_state.new_space_capacity -
|
| - (kNewSpaceAllocationThroughput * idle_time_ms);
|
| - GCIdleTimeAction action =
|
| - handler()->Compute(static_cast<double>(idle_time_ms), heap_state);
|
| - EXPECT_EQ(DO_SCAVENGE, action.type);
|
| + for (int i = 0; i < kMaxNotifications; i++) {
|
| + GCIdleTimeAction action = handler()->Compute(0, heap_state);
|
| + EXPECT_EQ(DO_NOTHING, action.type);
|
| + }
|
| }
|
|
|
|
|
| -TEST_F(GCIdleTimeHandlerTest, ScavengeAndDone) {
|
| +TEST_F(GCIdleTimeHandlerTest, SmallIdleTimeNothingToDo) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - int idle_time_ms = 10;
|
| - heap_state.can_start_incremental_marking = false;
|
| heap_state.incremental_marking_stopped = true;
|
| - heap_state.used_new_space_size =
|
| - heap_state.new_space_capacity -
|
| - (kNewSpaceAllocationThroughput * idle_time_ms);
|
| - GCIdleTimeAction action =
|
| - handler()->Compute(static_cast<double>(idle_time_ms), heap_state);
|
| - EXPECT_EQ(DO_SCAVENGE, action.type);
|
| - heap_state.used_new_space_size = 0;
|
| - action = handler()->Compute(static_cast<double>(idle_time_ms), heap_state);
|
| - EXPECT_EQ(DO_NOTHING, action.type);
|
| -}
|
| -
|
| -
|
| -TEST_F(GCIdleTimeHandlerTest, ZeroIdleTimeNothingToDo) {
|
| - GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - double idle_time_ms = 0;
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_NOTHING, action.type);
|
| + heap_state.can_start_incremental_marking = false;
|
| + for (int i = 0; i < kMaxNotifications; i++) {
|
| + GCIdleTimeAction action = handler()->Compute(10, heap_state);
|
| + EXPECT_EQ(DO_NOTHING, action.type);
|
| + }
|
| }
|
|
|
|
|
| -TEST_F(GCIdleTimeHandlerTest, ZeroIdleTimeDoNothingButStartIdleRound) {
|
| +TEST_F(GCIdleTimeHandlerTest, StayInReduceLatencyModeBecauseOfScavenges) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - double idle_time_ms = 10;
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxMarkCompactsInIdleRound; i++) {
|
| + heap_state.incremental_marking_stopped = true;
|
| + heap_state.can_start_incremental_marking = false;
|
| + double idle_time_ms = GCIdleTimeHandler::kMinLongIdleTime;
|
| + int limit = GCIdleTimeHandler::kLongIdleNotificationsBeforeMutatorIsIdle;
|
| + for (int i = 0; i < kMaxNotifications; i++) {
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - if (action.type == DONE) break;
|
| - EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| - // In this case we try to emulate incremental marking steps the finish with
|
| - // a full gc.
|
| - handler()->NotifyIdleMarkCompact();
|
| - }
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - // Emulate mutator work.
|
| - for (int i = 0; i < GCIdleTimeHandler::kIdleScavengeThreshold; i++) {
|
| - handler()->NotifyScavenge();
|
| + EXPECT_EQ(DO_NOTHING, action.type);
|
| + if ((i + 1) % limit == 0) handler()->NotifyScavenge();
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceLatency, handler()->mode());
|
| }
|
| - action = handler()->Compute(0, heap_state);
|
| - EXPECT_EQ(DO_NOTHING, action.type);
|
| }
|
|
|
|
|
| -TEST_F(GCIdleTimeHandlerTest, KeepDoingDoNothingWithZeroIdleTime) {
|
| +TEST_F(GCIdleTimeHandlerTest, StayInReduceLatencyModeBecauseOfMarkCompacts) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxNoProgressIdleTimesPerIdleRound;
|
| - i++) {
|
| - GCIdleTimeAction action = handler()->Compute(0, heap_state);
|
| + heap_state.incremental_marking_stopped = true;
|
| + heap_state.can_start_incremental_marking = false;
|
| + double idle_time_ms = GCIdleTimeHandler::kMinLongIdleTime;
|
| + int limit = GCIdleTimeHandler::kLongIdleNotificationsBeforeMutatorIsIdle;
|
| + for (int i = 0; i < kMaxNotifications; i++) {
|
| + GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DO_NOTHING, action.type);
|
| + if ((i + 1) % limit == 0) handler()->NotifyMarkCompact();
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceLatency, handler()->mode());
|
| }
|
| - // Should still return DO_NOTHING if we have been given 0 deadline yet.
|
| - GCIdleTimeAction action = handler()->Compute(0, heap_state);
|
| - EXPECT_EQ(DO_NOTHING, action.type);
|
| }
|
|
|
|
|
| -TEST_F(GCIdleTimeHandlerTest, DoneIfNotMakingProgressOnSweeping) {
|
| +TEST_F(GCIdleTimeHandlerTest, ReduceMemoryToReduceLatency) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| -
|
| - // Simulate sweeping being in-progress but not complete.
|
| heap_state.incremental_marking_stopped = true;
|
| heap_state.can_start_incremental_marking = false;
|
| - heap_state.sweeping_in_progress = true;
|
| - heap_state.sweeping_completed = false;
|
| - double idle_time_ms = 10.0;
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxNoProgressIdleTimesPerIdleRound;
|
| - i++) {
|
| + double idle_time_ms = GCIdleTimeHandler::kMinLongIdleTime;
|
| + int limit = GCIdleTimeHandler::kMaxIdleMarkCompacts;
|
| + for (int idle_gc = 0; idle_gc < limit; idle_gc++) {
|
| + TransitionToReduceMemoryMode(heap_state);
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_TRUE(action.reduce_memory);
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceMemory, handler()->mode());
|
| + for (int i = 0; i < idle_gc; i++) {
|
| + action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_TRUE(action.reduce_memory);
|
| + // ReduceMemory mode should tolerate one mutator GC per idle GC.
|
| + handler()->NotifyScavenge();
|
| + // Notify idle GC.
|
| + handler()->NotifyMarkCompact();
|
| + handler()->NotifyIdleMarkCompact();
|
| + }
|
| + // Transition to ReduceLatency mode after doing |idle_gc| idle GCs.
|
| + handler()->NotifyScavenge();
|
| + action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DO_NOTHING, action.type);
|
| + EXPECT_FALSE(action.reduce_memory);
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceLatency, handler()->mode());
|
| }
|
| - // We should return DONE after not making progress for some time.
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DONE, action.type);
|
| }
|
|
|
|
|
| -TEST_F(GCIdleTimeHandlerTest, DoneIfNotMakingProgressOnIncrementalMarking) {
|
| +TEST_F(GCIdleTimeHandlerTest, ReduceMemoryToDone) {
|
| GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
|
| -
|
| - // Simulate incremental marking stopped and not eligible to start.
|
| heap_state.incremental_marking_stopped = true;
|
| heap_state.can_start_incremental_marking = false;
|
| - double idle_time_ms = 10.0;
|
| - for (int i = 0; i < GCIdleTimeHandler::kMaxNoProgressIdleTimesPerIdleRound;
|
| - i++) {
|
| - GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| - EXPECT_EQ(DO_NOTHING, action.type);
|
| - }
|
| - // We should return DONE after not making progress for some time.
|
| + double idle_time_ms = GCIdleTimeHandler::kMinLongIdleTime;
|
| + int limit = GCIdleTimeHandler::kMaxIdleMarkCompacts;
|
| + TransitionToReduceMemoryMode(heap_state);
|
| GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_TRUE(action.reduce_memory);
|
| + for (int i = 0; i < limit; i++) {
|
| + action = handler()->Compute(idle_time_ms, heap_state);
|
| + EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
|
| + EXPECT_TRUE(action.reduce_memory);
|
| + EXPECT_EQ(GCIdleTimeHandler::kReduceMemory, handler()->mode());
|
| + // ReduceMemory mode should tolerate one mutator GC per idle GC.
|
| + handler()->NotifyScavenge();
|
| + // Notify idle GC.
|
| + handler()->NotifyMarkCompact();
|
| + handler()->NotifyIdleMarkCompact();
|
| + }
|
| + action = handler()->Compute(idle_time_ms, heap_state);
|
| EXPECT_EQ(DONE, action.type);
|
| }
|
|
|
| +
|
| } // namespace internal
|
| } // namespace v8
|
|
|