OLD | NEW |
---|---|
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 19 matching lines...) Expand all Loading... | |
30 | 30 |
31 #include "incremental-marking.h" | 31 #include "incremental-marking.h" |
32 | 32 |
33 namespace v8 { | 33 namespace v8 { |
34 namespace internal { | 34 namespace internal { |
35 | 35 |
36 | 36 |
37 bool IncrementalMarking::BaseRecordWrite(HeapObject* obj, | 37 bool IncrementalMarking::BaseRecordWrite(HeapObject* obj, |
38 Object** slot, | 38 Object** slot, |
39 Object* value) { | 39 Object* value) { |
40 MarkBit value_bit = Marking::MarkBitFrom(HeapObject::cast(value)); | 40 HeapObject* value_heap_obj = HeapObject::cast(value); |
41 MarkBit value_bit = Marking::MarkBitFrom(value_heap_obj); | |
41 if (Marking::IsWhite(value_bit)) { | 42 if (Marking::IsWhite(value_bit)) { |
42 MarkBit obj_bit = Marking::MarkBitFrom(obj); | 43 MarkBit obj_bit = Marking::MarkBitFrom(obj); |
43 if (Marking::IsBlack(obj_bit)) { | 44 // TODO(hpayer): make decision based on if object has a progress bar |
Michael Starzinger
2012/11/15 18:04:26
As discussed offline, can we rebase that to the br
payer
2012/11/16 13:43:05
Done.
I will add the optimization in the next CL.
| |
45 const int kLargeObjectSize = 1024 * 1024; | |
46 if (Marking::IsBlack(obj_bit) && obj->Size() > kLargeObjectSize) { | |
47 WhiteToGreyAndPush(value_heap_obj, value_bit); | |
48 RestartIfNotMarking(); | |
49 } else if (Marking::IsBlack(obj_bit)) { | |
Michael Starzinger
2012/11/15 18:04:26
Can we rewrite the condition so that it does the M
payer
2012/11/16 13:43:05
Done.
| |
44 BlackToGreyAndUnshift(obj, obj_bit); | 50 BlackToGreyAndUnshift(obj, obj_bit); |
45 RestartIfNotMarking(); | 51 RestartIfNotMarking(); |
52 return false; | |
53 } else | |
54 return false; | |
46 } | 55 } |
47 | |
48 // Object is either grey or white. It will be scanned if survives. | |
49 return false; | |
50 } | 56 } |
51 if (!is_compacting_) return false; | 57 if (!is_compacting_) return false; |
52 MarkBit obj_bit = Marking::MarkBitFrom(obj); | 58 MarkBit obj_bit = Marking::MarkBitFrom(obj); |
53 return Marking::IsBlack(obj_bit); | 59 return Marking::IsBlack(obj_bit); |
54 } | 60 } |
55 | 61 |
56 | 62 |
57 void IncrementalMarking::RecordWrite(HeapObject* obj, | 63 void IncrementalMarking::RecordWrite(HeapObject* obj, |
58 Object** slot, | 64 Object** slot, |
59 Object* value) { | 65 Object* value) { |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
121 | 127 |
122 void IncrementalMarking::WhiteToGreyAndPush(HeapObject* obj, MarkBit mark_bit) { | 128 void IncrementalMarking::WhiteToGreyAndPush(HeapObject* obj, MarkBit mark_bit) { |
123 Marking::WhiteToGrey(mark_bit); | 129 Marking::WhiteToGrey(mark_bit); |
124 marking_deque_.PushGrey(obj); | 130 marking_deque_.PushGrey(obj); |
125 } | 131 } |
126 | 132 |
127 | 133 |
128 } } // namespace v8::internal | 134 } } // namespace v8::internal |
129 | 135 |
130 #endif // V8_INCREMENTAL_MARKING_INL_H_ | 136 #endif // V8_INCREMENTAL_MARKING_INL_H_ |
OLD | NEW |