Chromium Code Reviews| 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 #ifndef V8_HEAP_MARK_COMPACT_H_ | 5 #ifndef V8_HEAP_MARK_COMPACT_H_ |
| 6 #define V8_HEAP_MARK_COMPACT_H_ | 6 #define V8_HEAP_MARK_COMPACT_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 | 9 |
| 10 #include "src/base/bits.h" | 10 #include "src/base/bits.h" |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 const MemoryChunk* p = MemoryChunk::FromAddress(address); | 40 const MemoryChunk* p = MemoryChunk::FromAddress(address); |
| 41 return p->markbits<mode>()->MarkBitFromIndex( | 41 return p->markbits<mode>()->MarkBitFromIndex( |
| 42 p->AddressToMarkbitIndex(address)); | 42 p->AddressToMarkbitIndex(address)); |
| 43 } | 43 } |
| 44 | 44 |
| 45 template <MarkingMode mode = MarkingMode::FULL> | 45 template <MarkingMode mode = MarkingMode::FULL> |
| 46 static Marking::ObjectColor Color(HeapObject* obj) { | 46 static Marking::ObjectColor Color(HeapObject* obj) { |
| 47 return Marking::Color(ObjectMarking::MarkBitFrom<mode>(obj)); | 47 return Marking::Color(ObjectMarking::MarkBitFrom<mode>(obj)); |
| 48 } | 48 } |
| 49 | 49 |
| 50 template <MarkingMode mode = MarkingMode::FULL> | 50 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
|
Michael Lippautz
2017/03/06 13:52:54
nit: Can you spell out the names, e.g. modication_
ulan
2017/03/06 14:51:33
+1, how about calling the parameter AccessMode?
Hannes Payer (out of office)
2017/03/08 14:12:57
Done.
Hannes Payer (out of office)
2017/03/08 14:12:57
Done.
| |
| 51 MarkingMode mode = MarkingMode::FULL> | |
| 51 V8_INLINE static bool IsImpossible(HeapObject* obj) { | 52 V8_INLINE static bool IsImpossible(HeapObject* obj) { |
| 52 return Marking::IsImpossible(MarkBitFrom<mode>(obj)); | 53 return Marking::IsImpossible<mod_mode>(MarkBitFrom<mode>(obj)); |
| 53 } | 54 } |
| 54 | 55 |
| 55 template <MarkingMode mode = MarkingMode::FULL> | 56 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 57 MarkingMode mode = MarkingMode::FULL> | |
| 56 V8_INLINE static bool IsBlack(HeapObject* obj) { | 58 V8_INLINE static bool IsBlack(HeapObject* obj) { |
| 57 return Marking::IsBlack(MarkBitFrom<mode>(obj)); | 59 return Marking::IsBlack<mod_mode>(MarkBitFrom<mode>(obj)); |
| 58 } | 60 } |
| 59 | 61 |
| 60 template <MarkingMode mode = MarkingMode::FULL> | 62 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 63 MarkingMode mode = MarkingMode::FULL> | |
| 61 V8_INLINE static bool IsWhite(HeapObject* obj) { | 64 V8_INLINE static bool IsWhite(HeapObject* obj) { |
| 62 return Marking::IsWhite(MarkBitFrom<mode>(obj)); | 65 return Marking::IsWhite<mod_mode>(MarkBitFrom<mode>(obj)); |
| 63 } | 66 } |
| 64 | 67 |
| 65 template <MarkingMode mode = MarkingMode::FULL> | 68 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 69 MarkingMode mode = MarkingMode::FULL> | |
| 66 V8_INLINE static bool IsGrey(HeapObject* obj) { | 70 V8_INLINE static bool IsGrey(HeapObject* obj) { |
| 67 return Marking::IsGrey(MarkBitFrom<mode>(obj)); | 71 return Marking::IsGrey<mod_mode>(MarkBitFrom<mode>(obj)); |
| 68 } | 72 } |
| 69 | 73 |
| 70 template <MarkingMode mode = MarkingMode::FULL> | 74 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 75 MarkingMode mode = MarkingMode::FULL> | |
| 71 V8_INLINE static bool IsBlackOrGrey(HeapObject* obj) { | 76 V8_INLINE static bool IsBlackOrGrey(HeapObject* obj) { |
| 72 return Marking::IsBlackOrGrey(MarkBitFrom<mode>(obj)); | 77 return Marking::IsBlackOrGrey<mod_mode>(MarkBitFrom<mode>(obj)); |
| 73 } | 78 } |
| 74 | 79 |
| 75 template <MarkingMode mode = MarkingMode::FULL> | 80 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 76 V8_INLINE static void BlackToGrey(HeapObject* obj) { | 81 MarkingMode mode = MarkingMode::FULL> |
| 77 DCHECK(IsBlack<mode>(obj)); | 82 V8_INLINE static bool BlackToGrey(HeapObject* obj) { |
| 83 DCHECK((IsBlack<mod_mode, mode>(obj))); | |
| 78 MarkBit markbit = MarkBitFrom<mode>(obj); | 84 MarkBit markbit = MarkBitFrom<mode>(obj); |
| 79 Marking::BlackToGrey(markbit); | 85 if (!Marking::BlackToGrey<mod_mode>(markbit)) return false; |
| 80 MemoryChunk::IncrementLiveBytes<mode>(obj, -obj->Size()); | 86 MemoryChunk::IncrementLiveBytes<mode>(obj, -obj->Size()); |
| 87 return true; | |
| 81 } | 88 } |
| 82 | 89 |
| 83 template <MarkingMode mode = MarkingMode::FULL> | 90 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 84 V8_INLINE static void WhiteToGrey(HeapObject* obj) { | 91 MarkingMode mode = MarkingMode::FULL> |
| 85 DCHECK(IsWhite<mode>(obj)); | 92 V8_INLINE static bool WhiteToGrey(HeapObject* obj) { |
| 86 Marking::WhiteToGrey(MarkBitFrom<mode>(obj)); | 93 DCHECK((IsWhite<mod_mode, mode>(obj))); |
| 94 return Marking::WhiteToGrey<mod_mode>(MarkBitFrom<mode>(obj)); | |
| 87 } | 95 } |
| 88 | 96 |
| 89 template <MarkingMode mode = MarkingMode::FULL> | 97 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 90 V8_INLINE static void WhiteToBlack(HeapObject* obj) { | 98 MarkingMode mode = MarkingMode::FULL> |
| 91 DCHECK(IsWhite<mode>(obj)); | 99 V8_INLINE static bool WhiteToBlack(HeapObject* obj) { |
| 100 DCHECK((IsWhite<mod_mode, mode>(obj))); | |
| 92 MarkBit markbit = MarkBitFrom<mode>(obj); | 101 MarkBit markbit = MarkBitFrom<mode>(obj); |
| 93 Marking::WhiteToBlack(markbit); | 102 if (!Marking::WhiteToBlack<mod_mode>(markbit)) return false; |
| 94 MemoryChunk::IncrementLiveBytes<mode>(obj, obj->Size()); | 103 MemoryChunk::IncrementLiveBytes<mode>(obj, obj->Size()); |
| 104 return true; | |
| 95 } | 105 } |
| 96 | 106 |
| 97 template <MarkingMode mode = MarkingMode::FULL> | 107 template <MarkBit::ModificationMode mod_mode = MarkBit::NON_ATOMIC, |
| 98 V8_INLINE static void GreyToBlack(HeapObject* obj) { | 108 MarkingMode mode = MarkingMode::FULL> |
| 99 DCHECK(IsGrey<mode>(obj)); | 109 V8_INLINE static bool GreyToBlack(HeapObject* obj) { |
| 110 DCHECK((IsGrey<mod_mode, mode>(obj))); | |
| 100 MarkBit markbit = MarkBitFrom<mode>(obj); | 111 MarkBit markbit = MarkBitFrom<mode>(obj); |
| 101 Marking::GreyToBlack(markbit); | 112 if (!Marking::GreyToBlack<mod_mode>(markbit)) return false; |
| 102 MemoryChunk::IncrementLiveBytes<mode>(obj, obj->Size()); | 113 MemoryChunk::IncrementLiveBytes<mode>(obj, obj->Size()); |
| 114 return true; | |
| 103 } | 115 } |
| 104 | 116 |
| 105 private: | 117 private: |
| 106 DISALLOW_IMPLICIT_CONSTRUCTORS(ObjectMarking); | 118 DISALLOW_IMPLICIT_CONSTRUCTORS(ObjectMarking); |
| 107 }; | 119 }; |
| 108 | 120 |
| 109 // ---------------------------------------------------------------------------- | 121 // ---------------------------------------------------------------------------- |
| 110 // Marking deque for tracing live objects. | 122 // Marking deque for tracing live objects. |
| 111 class MarkingDeque { | 123 class MarkingDeque { |
| 112 public: | 124 public: |
| (...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 830 | 842 |
| 831 private: | 843 private: |
| 832 MarkCompactCollector* collector_; | 844 MarkCompactCollector* collector_; |
| 833 }; | 845 }; |
| 834 | 846 |
| 835 V8_EXPORT_PRIVATE const char* AllocationSpaceName(AllocationSpace space); | 847 V8_EXPORT_PRIVATE const char* AllocationSpaceName(AllocationSpace space); |
| 836 } // namespace internal | 848 } // namespace internal |
| 837 } // namespace v8 | 849 } // namespace v8 |
| 838 | 850 |
| 839 #endif // V8_HEAP_MARK_COMPACT_H_ | 851 #endif // V8_HEAP_MARK_COMPACT_H_ |
| OLD | NEW |