Chromium Code Reviews| Index: src/profiler/heap-snapshot-generator.cc |
| diff --git a/src/profiler/heap-snapshot-generator.cc b/src/profiler/heap-snapshot-generator.cc |
| index e67acef268f1fdc340425ac07f59182287f3232c..8890052c934255b12402fde5b6ba411fc23977c0 100644 |
| --- a/src/profiler/heap-snapshot-generator.cc |
| +++ b/src/profiler/heap-snapshot-generator.cc |
| @@ -478,8 +478,8 @@ void HeapObjectsMap::UpdateHeapObjectsMap() { |
| PrintF("Begin HeapObjectsMap::UpdateHeapObjectsMap. map has %d entries.\n", |
| entries_map_.occupancy()); |
| } |
| - heap_->CollectAllGarbage(Heap::kMakeHeapIterableMask, |
| - "HeapObjectsMap::UpdateHeapObjectsMap"); |
| + heap_->CollectAllGarbage(Heap::kNoGCFlags, |
|
ulan
2016/05/10 14:05:42
We probably need to about incremental marking here
Hannes Payer (out of office)
2016/05/18 14:50:14
Done.
|
| + "HeapObjectsMap::UpdateHeapObjectsMap"); |
| HeapIterator iterator(heap_); |
| for (HeapObject* obj = iterator.next(); |
| obj != NULL; |
| @@ -2505,12 +2505,10 @@ bool HeapSnapshotGenerator::GenerateSnapshot() { |
| // full GC is reachable from the root when computing dominators. |
| // This is not true for weakly reachable objects. |
| // As a temporary solution we call GC twice. |
| - heap_->CollectAllGarbage( |
| - Heap::kMakeHeapIterableMask, |
| - "HeapSnapshotGenerator::GenerateSnapshot"); |
| - heap_->CollectAllGarbage( |
| - Heap::kMakeHeapIterableMask, |
| - "HeapSnapshotGenerator::GenerateSnapshot"); |
| + heap_->CollectAllGarbage(Heap::kNoGCFlags, |
| + "HeapSnapshotGenerator::GenerateSnapshot"); |
|
ulan
2016/05/10 14:05:41
Abort incremental marking
Hannes Payer (out of office)
2016/05/18 14:50:14
Done.
|
| + heap_->CollectAllGarbage(Heap::kNoGCFlags, |
|
ulan
2016/05/10 14:05:42
Abort incremental marking
Hannes Payer (out of office)
2016/05/18 14:50:14
Done.
|
| + "HeapSnapshotGenerator::GenerateSnapshot"); |
| #ifdef VERIFY_HEAP |
| Heap* debug_heap = heap_; |