Check if there is still time before finalizing an incremental collection.

test/unittests/heap/gc-idle-time-handler-unittest.cc

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 0b0d40cab7ec27e62cdfdf491a0a27fda50f18bb..6bf04cdc400bf8e98e9aa0f9edc93d25d20d0f40 100644
--- a/test/unittests/heap/gc-idle-time-handler-unittest.cc
+++ b/test/unittests/heap/gc-idle-time-handler-unittest.cc
@@ -112,7 +112,7 @@ TEST(GCIdleTimeHandler, EstimateMarkCompactTimeMax) {
 TEST_F(GCIdleTimeHandlerTest, DoScavengeEmptyNewSpace) {
   GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
   int idle_time_in_ms = 16;
-  EXPECT_FALSE(GCIdleTimeHandler::DoScavenge(
+  EXPECT_FALSE(GCIdleTimeHandler::ShouldDoScavenge(
       idle_time_in_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));
@@ -123,7 +123,7 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeFullNewSpace) {
   GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
   heap_state.used_new_space_size = kNewSpaceCapacity;
   int idle_time_in_ms = 16;
-  EXPECT_TRUE(GCIdleTimeHandler::DoScavenge(
+  EXPECT_TRUE(GCIdleTimeHandler::ShouldDoScavenge(
       idle_time_in_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));
@@ -135,7 +135,7 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeUnknownScavengeSpeed) {
   heap_state.used_new_space_size = kNewSpaceCapacity;
   heap_state.scavenge_speed_in_bytes_per_ms = 0;
   int idle_time_in_ms = 16;
-  EXPECT_FALSE(GCIdleTimeHandler::DoScavenge(
+  EXPECT_FALSE(GCIdleTimeHandler::ShouldDoScavenge(
       idle_time_in_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));
@@ -147,7 +147,7 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeLowScavengeSpeed) {
   heap_state.used_new_space_size = kNewSpaceCapacity;
   heap_state.scavenge_speed_in_bytes_per_ms = 1 * KB;
   int idle_time_in_ms = 16;
-  EXPECT_FALSE(GCIdleTimeHandler::DoScavenge(
+  EXPECT_FALSE(GCIdleTimeHandler::ShouldDoScavenge(
       idle_time_in_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));
@@ -159,13 +159,26 @@ TEST_F(GCIdleTimeHandlerTest, DoScavengeHighScavengeSpeed) {
   heap_state.used_new_space_size = kNewSpaceCapacity;
   heap_state.scavenge_speed_in_bytes_per_ms = kNewSpaceCapacity;
   int idle_time_in_ms = 16;
-  EXPECT_TRUE(GCIdleTimeHandler::DoScavenge(
+  EXPECT_TRUE(GCIdleTimeHandler::ShouldDoScavenge(
       idle_time_in_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 = 16;
+  EXPECT_TRUE(GCIdleTimeHandler::ShouldDoMarkCompact(idle_time_in_ms, 0, 0));
+}
+
+
+TEST_F(GCIdleTimeHandlerTest, DontDoMarkCompact) {
+  size_t idle_time_in_ms = 1;
+  EXPECT_FALSE(GCIdleTimeHandler::ShouldDoMarkCompact(
+      idle_time_in_ms, kSizeOfObjects, kMarkingSpeed));
+}

[Erik Corry Chromium.org, 2014/10/08 10:17:14]

I think if you changed kMaxIdleMarkingDelayCounter from 3 to 1000 then this test
would still pass.  Can we test that the constant is working as intended?

[Hannes Payer (out of office), 2014/10/13 13:25:45]

I added an integration test that test the constant. Unfortunately, we cannot
have a nice unit test since it lives in heap and depends on global state.

+
+
 TEST_F(GCIdleTimeHandlerTest, AfterContextDisposeLargeIdleTime) {
   GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
   heap_state.contexts_disposed = 1;