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/v8.h" | 5 #include "src/v8.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/base/bits.h" | 9 #include "src/base/bits.h" |
10 #include "src/base/once.h" | 10 #include "src/base/once.h" |
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
844 | 844 |
845 EnsureFillerObjectAtTop(); | 845 EnsureFillerObjectAtTop(); |
846 | 846 |
847 if (collector == SCAVENGER && !incremental_marking()->IsStopped()) { | 847 if (collector == SCAVENGER && !incremental_marking()->IsStopped()) { |
848 if (FLAG_trace_incremental_marking) { | 848 if (FLAG_trace_incremental_marking) { |
849 PrintF("[IncrementalMarking] Scavenge during marking.\n"); | 849 PrintF("[IncrementalMarking] Scavenge during marking.\n"); |
850 } | 850 } |
851 } | 851 } |
852 | 852 |
853 if (collector == MARK_COMPACTOR && | 853 if (collector == MARK_COMPACTOR && |
| 854 !mark_compact_collector()->finalize_incremental_marking() && |
854 !mark_compact_collector()->abort_incremental_marking() && | 855 !mark_compact_collector()->abort_incremental_marking() && |
855 !incremental_marking()->IsStopped() && | 856 !incremental_marking()->IsStopped() && |
856 !incremental_marking()->should_hurry() && | 857 !incremental_marking()->should_hurry() && |
857 FLAG_incremental_marking_steps) { | 858 FLAG_incremental_marking_steps) { |
858 // Make progress in incremental marking. | 859 // Make progress in incremental marking. |
859 const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB; | 860 const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB; |
860 incremental_marking()->Step(kStepSizeWhenDelayedByScavenge, | 861 incremental_marking()->Step(kStepSizeWhenDelayedByScavenge, |
861 IncrementalMarking::NO_GC_VIA_STACK_GUARD); | 862 IncrementalMarking::NO_GC_VIA_STACK_GUARD); |
862 if (!incremental_marking()->IsComplete() && | 863 if (!incremental_marking()->IsComplete() && |
863 !mark_compact_collector_.marking_deque_.IsEmpty() && !FLAG_gc_global) { | 864 !mark_compact_collector_.marking_deque_.IsEmpty() && !FLAG_gc_global) { |
(...skipping 5540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6404 static_cast<int>(object_sizes_last_time_[index])); | 6405 static_cast<int>(object_sizes_last_time_[index])); |
6405 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT) | 6406 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT) |
6406 #undef ADJUST_LAST_TIME_OBJECT_COUNT | 6407 #undef ADJUST_LAST_TIME_OBJECT_COUNT |
6407 | 6408 |
6408 MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); | 6409 MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); |
6409 MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); | 6410 MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); |
6410 ClearObjectStats(); | 6411 ClearObjectStats(); |
6411 } | 6412 } |
6412 } | 6413 } |
6413 } // namespace v8::internal | 6414 } // namespace v8::internal |
OLD | NEW |