Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/heap/mark-compact.cc

Issue 2735803005: [heap] Start concurrent marking simultaneously with incremental marking. (Closed)
Patch Set: fix test Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/heap/mark-compact.h ('k') | test/cctest/heap/test-concurrent-marking.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/mark-compact.h" 5 #include "src/heap/mark-compact.h"
6 6
7 #include "src/base/atomicops.h" 7 #include "src/base/atomicops.h"
8 #include "src/base/bits.h" 8 #include "src/base/bits.h"
9 #include "src/base/sys-info.h" 9 #include "src/base/sys-info.h"
10 #include "src/code-stubs.h" 10 #include "src/code-stubs.h"
11 #include "src/compilation-cache.h" 11 #include "src/compilation-cache.h"
12 #include "src/deoptimizer.h" 12 #include "src/deoptimizer.h"
13 #include "src/execution.h" 13 #include "src/execution.h"
14 #include "src/frames-inl.h" 14 #include "src/frames-inl.h"
15 #include "src/gdb-jit.h" 15 #include "src/gdb-jit.h"
16 #include "src/global-handles.h" 16 #include "src/global-handles.h"
17 #include "src/heap/array-buffer-tracker.h" 17 #include "src/heap/array-buffer-tracker.h"
18 #include "src/heap/concurrent-marking.h"
18 #include "src/heap/gc-tracer.h" 19 #include "src/heap/gc-tracer.h"
19 #include "src/heap/incremental-marking.h" 20 #include "src/heap/incremental-marking.h"
20 #include "src/heap/mark-compact-inl.h" 21 #include "src/heap/mark-compact-inl.h"
21 #include "src/heap/object-stats.h" 22 #include "src/heap/object-stats.h"
22 #include "src/heap/objects-visiting-inl.h" 23 #include "src/heap/objects-visiting-inl.h"
23 #include "src/heap/objects-visiting.h" 24 #include "src/heap/objects-visiting.h"
24 #include "src/heap/page-parallel-job.h" 25 #include "src/heap/page-parallel-job.h"
25 #include "src/heap/spaces-inl.h" 26 #include "src/heap/spaces-inl.h"
26 #include "src/ic/ic.h" 27 #include "src/ic/ic.h"
27 #include "src/ic/stub-cache.h" 28 #include "src/ic/stub-cache.h"
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 EnsureSweepingCompleted(); 841 EnsureSweepingCompleted();
841 842
842 if (heap()->incremental_marking()->IsSweeping()) { 843 if (heap()->incremental_marking()->IsSweeping()) {
843 heap()->incremental_marking()->Stop(); 844 heap()->incremental_marking()->Stop();
844 } 845 }
845 846
846 // If concurrent unmapping tasks are still running, we should wait for 847 // If concurrent unmapping tasks are still running, we should wait for
847 // them here. 848 // them here.
848 heap()->memory_allocator()->unmapper()->WaitUntilCompleted(); 849 heap()->memory_allocator()->unmapper()->WaitUntilCompleted();
849 850
851 heap()->concurrent_marking()->EnsureTaskCompleted();
852
850 // Clear marking bits if incremental marking is aborted. 853 // Clear marking bits if incremental marking is aborted.
851 if (was_marked_incrementally_ && heap_->ShouldAbortIncrementalMarking()) { 854 if (was_marked_incrementally_ && heap_->ShouldAbortIncrementalMarking()) {
852 heap()->incremental_marking()->Stop(); 855 heap()->incremental_marking()->Stop();
853 heap()->incremental_marking()->AbortBlackAllocation(); 856 heap()->incremental_marking()->AbortBlackAllocation();
854 ClearMarkbits(); 857 ClearMarkbits();
855 AbortWeakCollections(); 858 AbortWeakCollections();
856 AbortWeakCells(); 859 AbortWeakCells();
857 AbortTransitionArrays(); 860 AbortTransitionArrays();
858 AbortCompaction(); 861 AbortCompaction();
859 heap_->local_embedder_heap_tracer()->AbortTracing(); 862 heap_->local_embedder_heap_tracer()->AbortTracing();
(...skipping 3305 matching lines...) Expand 10 before | Expand all | Expand 10 after
4165 // The target is always in old space, we don't have to record the slot in 4168 // The target is always in old space, we don't have to record the slot in
4166 // the old-to-new remembered set. 4169 // the old-to-new remembered set.
4167 DCHECK(!heap()->InNewSpace(target)); 4170 DCHECK(!heap()->InNewSpace(target));
4168 RecordRelocSlot(host, &rinfo, target); 4171 RecordRelocSlot(host, &rinfo, target);
4169 } 4172 }
4170 } 4173 }
4171 } 4174 }
4172 4175
4173 } // namespace internal 4176 } // namespace internal
4174 } // namespace v8 4177 } // namespace v8
OLDNEW
« no previous file with comments | « src/heap/mark-compact.h ('k') | test/cctest/heap/test-concurrent-marking.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698