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/scopeinfo.h" | 9 #include "src/ast/scopeinfo.h" |
10 #include "src/base/bits.h" | 10 #include "src/base/bits.h" |
(...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
933 EnsureFillerObjectAtTop(); | 933 EnsureFillerObjectAtTop(); |
934 | 934 |
935 if (collector == SCAVENGER && !incremental_marking()->IsStopped()) { | 935 if (collector == SCAVENGER && !incremental_marking()->IsStopped()) { |
936 if (FLAG_trace_incremental_marking) { | 936 if (FLAG_trace_incremental_marking) { |
937 PrintF("[IncrementalMarking] Scavenge during marking.\n"); | 937 PrintF("[IncrementalMarking] Scavenge during marking.\n"); |
938 } | 938 } |
939 } | 939 } |
940 | 940 |
941 if (collector == MARK_COMPACTOR && !ShouldFinalizeIncrementalMarking() && | 941 if (collector == MARK_COMPACTOR && !ShouldFinalizeIncrementalMarking() && |
942 !ShouldAbortIncrementalMarking() && !incremental_marking()->IsStopped() && | 942 !ShouldAbortIncrementalMarking() && !incremental_marking()->IsStopped() && |
943 !incremental_marking()->should_hurry() && FLAG_incremental_marking) { | 943 !incremental_marking()->should_hurry() && FLAG_incremental_marking && |
| 944 OldGenerationAllocationLimitReached()) { |
944 // Make progress in incremental marking. | 945 // Make progress in incremental marking. |
945 const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB; | 946 const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB; |
946 incremental_marking()->Step(kStepSizeWhenDelayedByScavenge, | 947 incremental_marking()->Step(kStepSizeWhenDelayedByScavenge, |
947 IncrementalMarking::NO_GC_VIA_STACK_GUARD); | 948 IncrementalMarking::NO_GC_VIA_STACK_GUARD); |
948 if (!incremental_marking()->IsComplete() && | 949 if (!incremental_marking()->IsComplete() && |
949 !mark_compact_collector()->marking_deque_.IsEmpty() && | 950 !mark_compact_collector()->marking_deque_.IsEmpty() && |
950 !FLAG_gc_global) { | 951 !FLAG_gc_global) { |
951 if (FLAG_trace_incremental_marking) { | 952 if (FLAG_trace_incremental_marking) { |
952 PrintF("[IncrementalMarking] Delaying MarkSweep.\n"); | 953 PrintF("[IncrementalMarking] Delaying MarkSweep.\n"); |
953 } | 954 } |
(...skipping 5267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6221 } | 6222 } |
6222 | 6223 |
6223 | 6224 |
6224 // static | 6225 // static |
6225 int Heap::GetStaticVisitorIdForMap(Map* map) { | 6226 int Heap::GetStaticVisitorIdForMap(Map* map) { |
6226 return StaticVisitorBase::GetVisitorId(map); | 6227 return StaticVisitorBase::GetVisitorId(map); |
6227 } | 6228 } |
6228 | 6229 |
6229 } // namespace internal | 6230 } // namespace internal |
6230 } // namespace v8 | 6231 } // namespace v8 |
OLD | NEW |