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

Side by Side Diff: src/heap/remembered-set.cc

Issue 2403423007: [heap] Reland concurrent slot filtering in sweeper threads. (Closed)
Patch Set: Created 4 years, 2 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/remembered-set.h ('k') | src/heap/slot-set.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 2016 the V8 project authors. All rights reserved. 1 // Copyright 2016 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/remembered-set.h" 5 #include "src/heap/remembered-set.h"
6 #include "src/heap/heap-inl.h" 6 #include "src/heap/heap-inl.h"
7 #include "src/heap/heap.h" 7 #include "src/heap/heap.h"
8 #include "src/heap/mark-compact.h" 8 #include "src/heap/mark-compact.h"
9 #include "src/heap/slot-set.h" 9 #include "src/heap/slot-set.h"
10 #include "src/heap/spaces.h" 10 #include "src/heap/spaces.h"
11 #include "src/heap/store-buffer.h" 11 #include "src/heap/store-buffer.h"
12 #include "src/macro-assembler.h" 12 #include "src/macro-assembler.h"
13 13
14 namespace v8 { 14 namespace v8 {
15 namespace internal { 15 namespace internal {
16 16
17 template <PointerDirection direction> 17 template <PointerDirection direction>
18 void RememberedSet<direction>::ClearInvalidSlots(Heap* heap) { 18 void RememberedSet<direction>::ClearInvalidSlots(Heap* heap,
19 MemoryChunk* chunk) {
19 STATIC_ASSERT(direction == OLD_TO_NEW); 20 STATIC_ASSERT(direction == OLD_TO_NEW);
20 for (MemoryChunk* chunk : *heap->old_space()) { 21 DCHECK(chunk->owner()->identity() == OLD_SPACE ||
21 SlotSet* slots = GetSlotSet(chunk); 22 chunk->owner()->identity() == MAP_SPACE);
22 if (slots != nullptr) { 23 SlotSet* slots = GetSlotSet(chunk);
23 slots->Iterate( 24 if (slots != nullptr) {
24 [heap, chunk](Address addr) { 25 slots->Iterate(
25 Object** slot = reinterpret_cast<Object**>(addr); 26 [heap, chunk](Address addr) {
26 return IsValidSlot(heap, chunk, slot) ? KEEP_SLOT : REMOVE_SLOT; 27 Object** slot = reinterpret_cast<Object**>(addr);
27 }, 28 return IsValidSlot(heap, chunk, slot) ? KEEP_SLOT : REMOVE_SLOT;
28 SlotSet::PREFREE_EMPTY_BUCKETS); 29 },
29 } 30 SlotSet::KEEP_EMPTY_BUCKETS);
30 }
31 for (MemoryChunk* chunk : *heap->code_space()) {
32 TypedSlotSet* slots = GetTypedSlotSet(chunk);
33 if (slots != nullptr) {
34 slots->Iterate(
35 [heap, chunk](SlotType type, Address host_addr, Address addr) {
36 if (Marking::IsBlack(ObjectMarking::MarkBitFrom(host_addr))) {
37 return KEEP_SLOT;
38 } else {
39 return REMOVE_SLOT;
40 }
41 },
42 TypedSlotSet::PREFREE_EMPTY_CHUNKS);
43 }
44 }
45 for (MemoryChunk* chunk : *heap->map_space()) {
46 SlotSet* slots = GetSlotSet(chunk);
47 if (slots != nullptr) {
48 slots->Iterate(
49 [heap, chunk](Address addr) {
50 Object** slot = reinterpret_cast<Object**>(addr);
51 // TODO(mlippautz): In map space all allocations would ideally be
52 // map
53 // aligned. After establishing this invariant IsValidSlot could just
54 // refer to the containing object using alignment and check the mark
55 // bits.
56 return IsValidSlot(heap, chunk, slot) ? KEEP_SLOT : REMOVE_SLOT;
57 },
58 SlotSet::PREFREE_EMPTY_BUCKETS);
59 }
60 } 31 }
61 } 32 }
62 33
63 template <PointerDirection direction> 34 template <PointerDirection direction>
64 void RememberedSet<direction>::VerifyValidSlots(Heap* heap) { 35 void RememberedSet<direction>::ClearInvalidTypedSlots(Heap* heap,
65 Iterate(heap, [heap](Address addr) { 36 MemoryChunk* chunk) {
66 HeapObject* obj = 37 STATIC_ASSERT(direction == OLD_TO_NEW);
67 heap->mark_compact_collector()->FindBlackObjectBySlotSlow(addr); 38 DCHECK(chunk->owner()->identity() == CODE_SPACE);
68 if (obj == nullptr) { 39 TypedSlotSet* slots = GetTypedSlotSet(chunk);
69 // The slot is in dead object. 40 if (slots != nullptr) {
70 MemoryChunk* chunk = MemoryChunk::FromAnyPointerAddress(heap, addr); 41 slots->Iterate(
71 AllocationSpace owner = chunk->owner()->identity(); 42 [heap, chunk](SlotType type, Address host_addr, Address addr) {
72 // The old to old remembered set should not have dead slots. 43 if (Marking::IsBlack(ObjectMarking::MarkBitFrom(host_addr))) {
73 CHECK_NE(direction, OLD_TO_OLD); 44 return KEEP_SLOT;
74 // The old to new remembered set is allowed to have slots in dead 45 } else {
75 // objects only in map and large object space because these space 46 return REMOVE_SLOT;
76 // cannot have raw untagged pointers. 47 }
77 CHECK(owner == MAP_SPACE || owner == LO_SPACE); 48 },
78 } else { 49 TypedSlotSet::KEEP_EMPTY_CHUNKS);
79 int offset = static_cast<int>(addr - obj->address()); 50 }
80 CHECK(obj->IsValidSlot(offset));
81 }
82 return KEEP_SLOT;
83 });
84 } 51 }
85 52
86 template <PointerDirection direction> 53 template <PointerDirection direction>
87 bool RememberedSet<direction>::IsValidSlot(Heap* heap, MemoryChunk* chunk, 54 bool RememberedSet<direction>::IsValidSlot(Heap* heap, MemoryChunk* chunk,
88 Object** slot) { 55 Object** slot) {
89 STATIC_ASSERT(direction == OLD_TO_NEW); 56 STATIC_ASSERT(direction == OLD_TO_NEW);
90 Object* object = *slot;
91 if (!heap->InNewSpace(object)) {
92 return false;
93 }
94 HeapObject* heap_object = HeapObject::cast(object);
95 // If the target object is not black, the source slot must be part 57 // If the target object is not black, the source slot must be part
96 // of a non-black (dead) object. 58 // of a non-black (dead) object.
97 return Marking::IsBlack(ObjectMarking::MarkBitFrom(heap_object)) && 59 return heap->mark_compact_collector()->IsSlotInBlackObject(
98 heap->mark_compact_collector()->IsSlotInBlackObject( 60 chunk, reinterpret_cast<Address>(slot));
99 chunk, reinterpret_cast<Address>(slot));
100 } 61 }
101 62
102 template void RememberedSet<OLD_TO_NEW>::ClearInvalidSlots(Heap* heap); 63 template void RememberedSet<OLD_TO_NEW>::ClearInvalidSlots(Heap* heap,
103 template void RememberedSet<OLD_TO_NEW>::VerifyValidSlots(Heap* heap); 64 MemoryChunk* chunk);
104 template void RememberedSet<OLD_TO_OLD>::VerifyValidSlots(Heap* heap); 65 template void RememberedSet<OLD_TO_NEW>::ClearInvalidTypedSlots(
66 Heap* heap, MemoryChunk* chunk);
105 67
106 } // namespace internal 68 } // namespace internal
107 } // namespace v8 69 } // namespace v8
OLDNEW
« no previous file with comments | « src/heap/remembered-set.h ('k') | src/heap/slot-set.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698