Skip to content

Commit

Permalink
Don't start marking while sweeping
Browse files Browse the repository at this point in the history
BUG=none
R=hpayer@chromium.org
LOG=n

Review URL: https://codereview.chromium.org/1032963002

Cr-Commit-Position: refs/heads/master@{#27476}
  • Loading branch information
jeisinger authored and Commit bot committed Mar 26, 2015
1 parent 2455aad commit c290007
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/heap/heap.cc
Expand Up @@ -4610,7 +4610,8 @@ bool Heap::IdleNotification(double deadline_in_seconds) {
heap_state.incremental_marking_stopped = incremental_marking()->IsStopped();
// TODO(ulan): Start incremental marking only for large heaps.
heap_state.can_start_incremental_marking =
incremental_marking()->ShouldActivate() && FLAG_incremental_marking;
incremental_marking()->ShouldActivate() && FLAG_incremental_marking &&
!mark_compact_collector()->sweeping_in_progress();
heap_state.sweeping_in_progress =
mark_compact_collector()->sweeping_in_progress();
heap_state.mark_compact_speed_in_bytes_per_ms =
Expand Down

0 comments on commit c290007

Please sign in to comment.