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

Side by Side Diff: src/heap/incremental-marking.cc

Issue 1294093003: [heap] Unify MarkingDeque push and unshift operations. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@local_cleanup-includes-heap-2
Patch Set: Fix test case. Created 5 years, 4 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 | « no previous file | src/heap/incremental-marking-inl.h » ('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/v8.h" 5 #include "src/v8.h"
6 6
7 #include "src/heap/incremental-marking.h" 7 #include "src/heap/incremental-marking.h"
8 8
9 #include "src/code-stubs.h" 9 #include "src/code-stubs.h"
10 #include "src/compilation-cache.h" 10 #include "src/compilation-cache.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 VisitPointers(heap, object, HeapObject::RawField(object, start_offset), 192 VisitPointers(heap, object, HeapObject::RawField(object, start_offset),
193 HeapObject::RawField(object, end_offset)); 193 HeapObject::RawField(object, end_offset));
194 start_offset = end_offset; 194 start_offset = end_offset;
195 end_offset = Min(object_size, end_offset + kProgressBarScanningChunk); 195 end_offset = Min(object_size, end_offset + kProgressBarScanningChunk);
196 scan_until_end = 196 scan_until_end =
197 heap->mark_compact_collector()->marking_deque()->IsFull(); 197 heap->mark_compact_collector()->marking_deque()->IsFull();
198 } while (scan_until_end && start_offset < object_size); 198 } while (scan_until_end && start_offset < object_size);
199 chunk->set_progress_bar(start_offset); 199 chunk->set_progress_bar(start_offset);
200 if (start_offset < object_size) { 200 if (start_offset < object_size) {
201 if (Marking::IsGrey(Marking::MarkBitFrom(object))) { 201 if (Marking::IsGrey(Marking::MarkBitFrom(object))) {
202 heap->mark_compact_collector()->marking_deque()->UnshiftGrey(object); 202 heap->mark_compact_collector()->marking_deque()->Unshift(object);
203 } else { 203 } else {
204 DCHECK(Marking::IsBlack(Marking::MarkBitFrom(object))); 204 DCHECK(Marking::IsBlack(Marking::MarkBitFrom(object)));
205 heap->mark_compact_collector()->UnshiftBlack(object); 205 heap->mark_compact_collector()->UnshiftBlack(object);
206 } 206 }
207 heap->incremental_marking()->NotifyIncompleteScanOfObject( 207 heap->incremental_marking()->NotifyIncompleteScanOfObject(
208 object_size - (start_offset - already_scanned_offset)); 208 object_size - (start_offset - already_scanned_offset));
209 } 209 }
210 } else { 210 } else {
211 FixedArrayVisitor::Visit(map, object); 211 FixedArrayVisitor::Visit(map, object);
212 } 212 }
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 void IncrementalMarking::IncrementIdleMarkingDelayCounter() { 1023 void IncrementalMarking::IncrementIdleMarkingDelayCounter() {
1024 idle_marking_delay_counter_++; 1024 idle_marking_delay_counter_++;
1025 } 1025 }
1026 1026
1027 1027
1028 void IncrementalMarking::ClearIdleMarkingDelayCounter() { 1028 void IncrementalMarking::ClearIdleMarkingDelayCounter() {
1029 idle_marking_delay_counter_ = 0; 1029 idle_marking_delay_counter_ = 0;
1030 } 1030 }
1031 } // namespace internal 1031 } // namespace internal
1032 } // namespace v8 1032 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | src/heap/incremental-marking-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698