Chromium Code Reviews| Index: src/heap/gc-idle-time-handler.cc |
| diff --git a/src/heap/gc-idle-time-handler.cc b/src/heap/gc-idle-time-handler.cc |
| index f76c48bf9e3ed615ac7f04af25bda87b92014eb0..1449ec2dec3ace4653f6038e48f1ffc5e77a385e 100644 |
| --- a/src/heap/gc-idle-time-handler.cc |
| +++ b/src/heap/gc-idle-time-handler.cc |
| @@ -25,9 +25,8 @@ void GCIdleTimeAction::Print() { |
| case DO_NOTHING: |
| PrintF("no action"); |
| break; |
| - case DO_INCREMENTAL_MARKING: |
| - PrintF("incremental marking with step %" V8_PTR_PREFIX "d / ms", |
| - parameter); |
| + case DO_INCREMENTAL_STEP: |
| + PrintF("incremental step"); |
| if (additional_work) { |
| PrintF("; finalized marking"); |
| } |
| @@ -38,9 +37,6 @@ void GCIdleTimeAction::Print() { |
| case DO_FULL_GC: |
| PrintF("full GC"); |
| break; |
| - case DO_FINALIZE_SWEEPING: |
| - PrintF("finalize sweeping"); |
| - break; |
| } |
| } |
| @@ -250,22 +246,9 @@ GCIdleTimeAction GCIdleTimeHandler::Compute(double idle_time_in_ms, |
| return GCIdleTimeAction::Scavenge(); |
| } |
| - if (heap_state.sweeping_in_progress) { |
| - if (heap_state.sweeping_completed) { |
| - return GCIdleTimeAction::FinalizeSweeping(); |
| - } else { |
| - return NothingOrDone(idle_time_in_ms); |
| - } |
| - } |
| - |
| - if (!FLAG_incremental_marking || heap_state.incremental_marking_stopped) { |
| - return GCIdleTimeAction::Done(); |
| - } |
| + if (heap_state.incremental_marking_stopped) return GCIdleTimeAction::Done(); |
|
Hannes Payer (out of office)
2015/08/05 12:35:44
!FLAG_incremental_marking ||
ulan
2015/08/05 12:45:40
Done.
|
| - size_t step_size = EstimateMarkingStepSize( |
| - static_cast<size_t>(kIncrementalMarkingStepTimeInMs), |
| - heap_state.incremental_marking_speed_in_bytes_per_ms); |
| - return GCIdleTimeAction::IncrementalMarking(step_size); |
| + return GCIdleTimeAction::IncrementalStep(); |
| } |