Allocation sampling for paged/lo spaces

src/heap/spaces.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/heap/spaces.h"
 
 #include "src/base/bits.h"
 #include "src/base/platform/platform.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/heap/slots-buffer.h"
@@ skipping 1637 matching lines @@
     top_on_previous_step_ =
         inline_allocation_observers_.length() ? allocation_info_.top() : 0;
     UpdateInlineAllocationLimit(0);
   }
 }
 
 
 intptr_t NewSpace::GetNextInlineAllocationStepSize() {
   intptr_t next_step = 0;
   for (int i = 0; i < inline_allocation_observers_.length(); ++i) {
-    InlineAllocationObserver* o = inline_allocation_observers_[i];
+    AllocationObserver* o = inline_allocation_observers_[i];
     next_step = next_step ? Min(next_step, o->bytes_to_next_step())
                           : o->bytes_to_next_step();
   }
   DCHECK(inline_allocation_observers_.length() == 0 || next_step != 0);
   return next_step;
 }
 
 
-void NewSpace::AddInlineAllocationObserver(InlineAllocationObserver* observer) {
+void NewSpace::AddInlineAllocationObserver(AllocationObserver* observer) {
   inline_allocation_observers_.Add(observer);
   StartNextInlineAllocationStep();
 }
 
 
-void NewSpace::RemoveInlineAllocationObserver(
-    InlineAllocationObserver* observer) {
+void NewSpace::RemoveInlineAllocationObserver(AllocationObserver* observer) {
   bool removed = inline_allocation_observers_.RemoveElement(observer);
   // Only used in assertion. Suppress unused variable warning.
   static_cast<void>(removed);
   DCHECK(removed);
   StartNextInlineAllocationStep();
 }
 
 
 void NewSpace::PauseInlineAllocationObservers() {
   // Do a step to account for memory allocated so far.
   InlineAllocationStep(top(), top(), nullptr, 0);
   inline_allocation_observers_paused_ = true;
   top_on_previous_step_ = 0;
   UpdateInlineAllocationLimit(0);
 }
 
 
 void NewSpace::ResumeInlineAllocationObservers() {
   DCHECK(top_on_previous_step_ == 0);
   inline_allocation_observers_paused_ = false;
   StartNextInlineAllocationStep();
 }
 
 
 void NewSpace::InlineAllocationStep(Address top, Address new_top,
                                     Address soon_object, size_t size) {
   if (top_on_previous_step_) {
     int bytes_allocated = static_cast<int>(top - top_on_previous_step_);
     for (int i = 0; i < inline_allocation_observers_.length(); ++i) {
-      inline_allocation_observers_[i]->InlineAllocationStep(bytes_allocated,
-                                                            soon_object, size);
+      inline_allocation_observers_[i]->AllocationStep(bytes_allocated,
+                                                      soon_object, size);
     }
     top_on_previous_step_ = new_top;
   }
 }
 
 #ifdef VERIFY_HEAP
 // We do not use the SemiSpaceIterator because verification doesn't assume
 // that it works (it depends on the invariants we are checking).
 void NewSpace::Verify() {
   // The allocation pointer should be in the space or at the very end.
@@ skipping 900 matching lines @@
   // Don't free list allocate if there is linear space available.
   DCHECK(owner_->limit() - owner_->top() < size_in_bytes);
 
   int old_linear_size = static_cast<int>(owner_->limit() - owner_->top());
   // Mark the old linear allocation area with a free space map so it can be
   // skipped when scanning the heap.  This also puts it back in the free list
   // if it is big enough.
   owner_->Free(owner_->top(), old_linear_size);
   owner_->SetTopAndLimit(nullptr, nullptr);
 
   owner_->heap()->incremental_marking()->OldSpaceStep(size_in_bytes -

[ofrobots, 2016/01/23 16:16:31]

You probably need to notify the observers here too.

[ofrobots, 2016/01/26 00:41:51]

*bump*

[mattloring, 2016/01/26 00:42:48]

Done.

                                                       old_linear_size);
 
   int new_node_size = 0;
   FreeSpace* new_node = FindNodeFor(size_in_bytes, &new_node_size);
   if (new_node == nullptr) return nullptr;
 
   int bytes_left = new_node_size - size_in_bytes;
   DCHECK(bytes_left >= 0);
 
 #ifdef DEBUG
@@ skipping 496 matching lines @@
 
   if (Heap::ShouldZapGarbage()) {
     // Make the object consistent so the heap can be verified in OldSpaceStep.
     // We only need to do this in debug builds or if verify_heap is on.
     reinterpret_cast<Object**>(object->address())[0] =
         heap()->fixed_array_map();
     reinterpret_cast<Object**>(object->address())[1] = Smi::FromInt(0);
   }
 
   heap()->incremental_marking()->OldSpaceStep(object_size);
+  for (int i = 0; i < allocation_observers_.length(); ++i) {
+    AllocationObserver* o = allocation_observers_[i];
+    o->AllocationStep(object_size, object->address(), object_size);
+  }

[ofrobots, 2016/01/23 16:16:31]

This loop has been duplicated in a few places. It would be good to refactor to
avoid duplication.

[mattloring, 2016/01/26 00:42:48]

Done.

   return object;
 }
 
 
 size_t LargeObjectSpace::CommittedPhysicalMemory() {
   if (!base::VirtualMemory::HasLazyCommits()) return CommittedMemory();
   size_t size = 0;
   LargePage* current = first_page_;
   while (current != NULL) {
     size += current->CommittedPhysicalMemory();
@@ skipping 211 matching lines @@
     object->ShortPrint();
     PrintF("\n");
   }
   printf(" --------------------------------------\n");
   printf(" Marked: %x, LiveCount: %x\n", mark_size, LiveBytes());
 }
 
 #endif  // DEBUG
 }  // namespace internal
 }  // namespace v8