Index: src/heap/gc-idle-time-handler.h |
diff --git a/src/heap/gc-idle-time-handler.h b/src/heap/gc-idle-time-handler.h |
index bc196ce93a181e15dce8817a651ec00a9bae42f3..5a842a85971f42823edc93cba4ca754c408f656a 100644 |
--- a/src/heap/gc-idle-time-handler.h |
+++ b/src/heap/gc-idle-time-handler.h |
@@ -14,8 +14,7 @@ enum GCIdleTimeActionType { |
DO_NOTHING, |
DO_INCREMENTAL_MARKING, |
DO_SCAVENGE, |
- DO_FULL_GC, |
- DO_FINALIZE_SWEEPING |
+ DO_FULL_GC |
}; |
@@ -27,21 +26,18 @@ class GCIdleTimeAction { |
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; |
@@ -49,13 +45,6 @@ class GCIdleTimeAction { |
return result; |
} |
- static GCIdleTimeAction FinalizeSweeping() { |
- GCIdleTimeAction result; |
- result.type = DO_FINALIZE_SWEEPING; |
- result.parameter = 0; |
- return result; |
- } |
- |
GCIdleTimeActionType type; |
intptr_t parameter; |
}; |
@@ -83,25 +72,20 @@ class GCIdleTimeHandler { |
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() { |