Index: src/profile-generator.cc |
=================================================================== |
--- src/profile-generator.cc (revision 7102) |
+++ src/profile-generator.cc (working copy) |
@@ -2218,11 +2218,11 @@ |
void HeapSnapshotGenerator::SetProgressTotal(int iterations_count) { |
if (control_ == NULL) return; |
- HeapIterator iterator(HeapIterator::kFilterUnreachable); |
+ HeapIterator iterator; |
int objects_count = 0; |
- for (HeapObject* obj = iterator.next(); |
+ for (HeapObject* obj = iterator.Next(); |
obj != NULL; |
- obj = iterator.next(), ++objects_count) {} |
+ obj = iterator.Next(), ++objects_count) {} |
progress_total_ = objects_count * iterations_count; |
progress_counter_ = 0; |
} |
@@ -2371,12 +2371,13 @@ |
bool HeapSnapshotGenerator::IterateAndExtractReferences() { |
- HeapIterator iterator(HeapIterator::kFilterUnreachable); |
+ Heap::EnsureHeapIsIterable(); |
Vyacheslav Egorov (Chromium)
2011/03/15 09:20:09
Sometimes we call Ensure, sometimes we don't.
Thi
Erik Corry
2011/03/17 13:39:17
Done.
|
+ HeapIterator iterator; |
bool interrupted = false; |
// Heap iteration with filtering must be finished in any case. |
- for (HeapObject* obj = iterator.next(); |
+ for (HeapObject* obj = iterator.Next(); |
obj != NULL; |
- obj = iterator.next(), IncProgressCounter()) { |
+ obj = iterator.Next(), IncProgressCounter()) { |
if (!interrupted) { |
ExtractReferences(obj); |
if (!ReportProgress()) interrupted = true; |