OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/heap/heap.h" | 5 #include "src/heap/heap.h" |
6 | 6 |
7 #include "src/accessors.h" | 7 #include "src/accessors.h" |
8 #include "src/api.h" | 8 #include "src/api.h" |
9 #include "src/ast/context-slot-cache.h" | 9 #include "src/ast/context-slot-cache.h" |
10 #include "src/base/bits.h" | 10 #include "src/base/bits.h" |
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
955 if (FLAG_trace_incremental_marking) { | 955 if (FLAG_trace_incremental_marking) { |
956 isolate()->PrintWithTimestamp( | 956 isolate()->PrintWithTimestamp( |
957 "[IncrementalMarking] Scavenge during marking.\n"); | 957 "[IncrementalMarking] Scavenge during marking.\n"); |
958 } | 958 } |
959 } | 959 } |
960 | 960 |
961 if (collector == MARK_COMPACTOR && FLAG_incremental_marking && | 961 if (collector == MARK_COMPACTOR && FLAG_incremental_marking && |
962 !ShouldFinalizeIncrementalMarking() && !ShouldAbortIncrementalMarking() && | 962 !ShouldFinalizeIncrementalMarking() && !ShouldAbortIncrementalMarking() && |
963 !incremental_marking()->IsStopped() && | 963 !incremental_marking()->IsStopped() && |
964 !incremental_marking()->should_hurry() && | 964 !incremental_marking()->should_hurry() && |
| 965 !incremental_marking()->NeedsFinalization() && |
965 !IsCloseToOutOfMemory(new_space_->Capacity())) { | 966 !IsCloseToOutOfMemory(new_space_->Capacity())) { |
966 if (!incremental_marking()->IsComplete() && | 967 if (!incremental_marking()->IsComplete() && |
967 !mark_compact_collector()->marking_deque()->IsEmpty() && | 968 !mark_compact_collector()->marking_deque()->IsEmpty() && |
968 !FLAG_gc_global) { | 969 !FLAG_gc_global) { |
969 if (FLAG_trace_incremental_marking) { | 970 if (FLAG_trace_incremental_marking) { |
970 isolate()->PrintWithTimestamp( | 971 isolate()->PrintWithTimestamp( |
971 "[IncrementalMarking] Delaying MarkSweep.\n"); | 972 "[IncrementalMarking] Delaying MarkSweep.\n"); |
972 } | 973 } |
973 collector = YoungGenerationCollector(); | 974 collector = YoungGenerationCollector(); |
974 collector_reason = "incremental marking delaying mark-sweep"; | 975 collector_reason = "incremental marking delaying mark-sweep"; |
(...skipping 5508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6483 } | 6484 } |
6484 | 6485 |
6485 | 6486 |
6486 // static | 6487 // static |
6487 int Heap::GetStaticVisitorIdForMap(Map* map) { | 6488 int Heap::GetStaticVisitorIdForMap(Map* map) { |
6488 return StaticVisitorBase::GetVisitorId(map); | 6489 return StaticVisitorBase::GetVisitorId(map); |
6489 } | 6490 } |
6490 | 6491 |
6491 } // namespace internal | 6492 } // namespace internal |
6492 } // namespace v8 | 6493 } // namespace v8 |
OLD | NEW |