Get rid of distinction between below- and above-watermark in page allocation....

src/profile-generator.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 2200 matching lines @@
   HeapEntry* child_entry = GetEntry(child_obj);
   if (child_entry != NULL) {
     filler_->SetStrongRootReference(child_obj, child_entry);
   }
 }
 
 
 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;
 }
 
 
 bool HeapSnapshotGenerator::CountEntriesAndReferences() {
   SnapshotCounter counter(&entries_);
   filler_ = &counter;
   filler_->AddEntry(HeapSnapshot::kInternalRootObject);
   filler_->AddEntry(HeapSnapshot::kGcRootsObject);
@@ skipping 128 matching lines @@
          entry = dominator, dominator = entry->dominator()) {
       dominator->add_retained_size(entry_size);
     }
     if (!ReportProgress()) return false;
   }
   return true;
 }
 
 
 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.

This is too implicit. Can we move this decision into iterator constructor?

[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;
     }
   }
   if (interrupted) return false;
   SetRootGcRootsReference();
   RootsReferencesExtractor extractor(this);
   Heap::IterateRoots(&extractor, VISIT_ALL);
   return ReportProgress();
@@ skipping 443 matching lines @@
 
 
 String* GetConstructorNameForHeapProfile(JSObject* object) {
   if (object->IsJSFunction()) return Heap::closure_symbol();
   return object->constructor_name();
 }
 
 } }  // namespace v8::internal
 
 #endif  // ENABLE_LOGGING_AND_PROFILING