Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 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 26 matching lines...) Expand all Loading... | |
| 37 | 37 |
| 38 | 38 |
| 39 MarkBit Marking::MarkBitFrom(Address addr) { | 39 MarkBit Marking::MarkBitFrom(Address addr) { |
| 40 MemoryChunk *p = MemoryChunk::FromAddress(addr); | 40 MemoryChunk *p = MemoryChunk::FromAddress(addr); |
| 41 return p->markbits()->MarkBitFromIndex(p->AddressToMarkbitIndex(addr), | 41 return p->markbits()->MarkBitFromIndex(p->AddressToMarkbitIndex(addr), |
| 42 p->ContainsOnlyData()); | 42 p->ContainsOnlyData()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 | 45 |
| 46 void MarkCompactCollector::SetFlags(int flags) { | 46 void MarkCompactCollector::SetFlags(int flags) { |
| 47 force_compaction_ = ((flags & Heap::kForceCompactionMask) != 0); | |
| 48 sweep_precisely_ = ((flags & Heap::kMakeHeapIterableMask) != 0); | 47 sweep_precisely_ = ((flags & Heap::kMakeHeapIterableMask) != 0); |
| 49 } | 48 } |
| 50 | 49 |
| 51 | 50 |
| 52 void MarkCompactCollector::MarkObject(HeapObject* obj, MarkBit mark_bit) { | 51 void MarkCompactCollector::MarkObject(HeapObject* obj, MarkBit mark_bit) { |
| 53 ASSERT(Marking::MarkBitFrom(obj) == mark_bit); | 52 ASSERT(Marking::MarkBitFrom(obj) == mark_bit); |
| 54 if (!mark_bit.Get()) { | 53 if (!mark_bit.Get()) { |
| 55 mark_bit.Set(); | 54 mark_bit.Set(); |
| 56 tracer_->increment_marked_count(); | |
| 57 #ifdef DEBUG | 55 #ifdef DEBUG |
| 58 UpdateLiveObjectCount(obj); | 56 UpdateLiveObjectCount(obj); |
| 59 #endif | 57 #endif |
| 60 ProcessNewlyMarkedObject(obj); | 58 ProcessNewlyMarkedObject(obj); |
| 61 } | 59 } |
| 62 } | 60 } |
| 63 | 61 |
|
Erik Corry
2011/06/20 20:41:26
missing blank line
Vyacheslav Egorov (Chromium)
2011/06/21 11:44:48
Done.
| |
| 64 void MarkCompactCollector::SetMark(HeapObject* obj, MarkBit mark_bit) { | 62 void MarkCompactCollector::SetMark(HeapObject* obj, MarkBit mark_bit) { |
| 65 ASSERT(Marking::MarkBitFrom(obj) == mark_bit); | 63 ASSERT(Marking::MarkBitFrom(obj) == mark_bit); |
| 66 mark_bit.Set(); | 64 mark_bit.Set(); |
| 67 tracer_->increment_marked_count(); | |
| 68 #ifdef DEBUG | 65 #ifdef DEBUG |
| 69 UpdateLiveObjectCount(obj); | 66 UpdateLiveObjectCount(obj); |
| 70 #endif | 67 #endif |
| 71 } | 68 } |
| 72 | 69 |
| 73 | 70 |
| 74 bool MarkCompactCollector::IsMarked(Object* obj) { | 71 bool MarkCompactCollector::IsMarked(Object* obj) { |
| 75 ASSERT(obj->IsHeapObject()); | 72 ASSERT(obj->IsHeapObject()); |
| 76 HeapObject* heap_object = HeapObject::cast(obj); | 73 HeapObject* heap_object = HeapObject::cast(obj); |
| 77 return Marking::MarkBitFrom(heap_object).Get(); | 74 return Marking::MarkBitFrom(heap_object).Get(); |
| 78 } | 75 } |
| 79 | 76 |
| 80 | 77 |
| 81 } } // namespace v8::internal | 78 } } // namespace v8::internal |
| 82 | 79 |
| 83 #endif // V8_MARK_COMPACT_INL_H_ | 80 #endif // V8_MARK_COMPACT_INL_H_ |
| OLD | NEW |