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

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

Issue 2183383004: Revert of [heap] Reland "Remove black pages and use black areas instead." (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 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 | « src/heap/heap-inl.h ('k') | src/heap/incremental-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 #ifndef V8_HEAP_INCREMENTAL_MARKING_H_ 5 #ifndef V8_HEAP_INCREMENTAL_MARKING_H_
6 #define V8_HEAP_INCREMENTAL_MARKING_H_ 6 #define V8_HEAP_INCREMENTAL_MARKING_H_
7 7
8 #include "src/cancelable-task.h" 8 #include "src/cancelable-task.h"
9 #include "src/execution.h" 9 #include "src/execution.h"
10 #include "src/heap/heap.h" 10 #include "src/heap/heap.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 } 201 }
202 202
203 void ClearIdleMarkingDelayCounter(); 203 void ClearIdleMarkingDelayCounter();
204 204
205 bool IsIdleMarkingDelayCounterLimitReached(); 205 bool IsIdleMarkingDelayCounterLimitReached();
206 206
207 static void MarkObject(Heap* heap, HeapObject* object); 207 static void MarkObject(Heap* heap, HeapObject* object);
208 208
209 static void TransferMark(Heap* heap, Address old_start, Address new_start); 209 static void TransferMark(Heap* heap, Address old_start, Address new_start);
210 210
211 // Returns true if the color transfer requires live bytes updating. 211 // Returns true if the transferred color is black.
212 INLINE(static bool TransferColor(HeapObject* from, HeapObject* to, 212 INLINE(static bool TransferColor(HeapObject* from, HeapObject* to)) {
213 int size)) { 213 if (Page::FromAddress(to->address())->IsFlagSet(Page::BLACK_PAGE))
214 return true;
214 MarkBit from_mark_bit = ObjectMarking::MarkBitFrom(from); 215 MarkBit from_mark_bit = ObjectMarking::MarkBitFrom(from);
215 MarkBit to_mark_bit = ObjectMarking::MarkBitFrom(to); 216 MarkBit to_mark_bit = ObjectMarking::MarkBitFrom(to);
216
217 if (Marking::IsBlack(to_mark_bit)) {
218 DCHECK(to->GetHeap()->incremental_marking()->black_allocation());
219 return false;
220 }
221
222 DCHECK(Marking::IsWhite(to_mark_bit)); 217 DCHECK(Marking::IsWhite(to_mark_bit));
223 if (from_mark_bit.Get()) { 218 if (from_mark_bit.Get()) {
224 to_mark_bit.Set(); 219 to_mark_bit.Set();
225 if (from_mark_bit.Next().Get()) { 220 if (from_mark_bit.Next().Get()) {
226 to_mark_bit.Next().Set(); 221 to_mark_bit.Next().Set();
227 return true; 222 return true;
228 } 223 }
229 } 224 }
230 return false; 225 return false;
231 } 226 }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 GCRequestType request_type_; 323 GCRequestType request_type_;
329 324
330 IncrementalMarkingJob incremental_marking_job_; 325 IncrementalMarkingJob incremental_marking_job_;
331 326
332 DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking); 327 DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalMarking);
333 }; 328 };
334 } // namespace internal 329 } // namespace internal
335 } // namespace v8 330 } // namespace v8
336 331
337 #endif // V8_HEAP_INCREMENTAL_MARKING_H_ 332 #endif // V8_HEAP_INCREMENTAL_MARKING_H_
OLDNEW
« no previous file with comments | « src/heap/heap-inl.h ('k') | src/heap/incremental-marking.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698