Updated MallocHooks to collect stack traces when memory is allocated.

runtime/vm/profiler.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/address_sanitizer.h"
 #include "platform/memory_sanitizer.h"
 #include "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
@@ skipping 150 matching lines @@
 
 Sample* SampleBuffer::ReserveSample() {
   return At(ReserveSampleSlot());
 }
 
 
 Sample* SampleBuffer::ReserveSampleAndLink(Sample* previous) {
   ASSERT(previous != NULL);
   intptr_t next_index = ReserveSampleSlot();
   Sample* next = At(next_index);
-  next->Init(previous->isolate(), previous->timestamp(), previous->tid());
+  next->Init(previous->port(), previous->timestamp(), previous->tid());
   next->set_head_sample(false);
   // Mark that previous continues at next.
   previous->SetContinuationIndex(next_index);
   return next;
 }
 
 
 // Attempts to find the true return address when a Dart frame is being setup
 // or torn down.
 // NOTE: Architecture specific implementations below.
@@ skipping 132 matching lines @@
 }
 
 
 bool SampleFilter::TaskFilterSample(Sample* sample) {
   const intptr_t task = static_cast<intptr_t>(sample->thread_task());
   return (task & thread_task_mask_) != 0;
 }
 
 
 ClearProfileVisitor::ClearProfileVisitor(Isolate* isolate)
-    : SampleVisitor(isolate) {}
+    : SampleVisitor(isolate->main_port()) {}
 
 
 void ClearProfileVisitor::VisitSample(Sample* sample) {
   sample->Clear();
 }
 
 
 static void DumpStackFrame(intptr_t frame_index, uword pc) {
   Isolate* isolate = Isolate::Current();
   if ((isolate != NULL) && isolate->is_runnable()) {
@@ skipping 15 matching lines @@
     OS::PrintErr("  [0x%" Pp "] Unknown symbol\n", pc);
   } else {
     OS::PrintErr("  [0x%" Pp "] %s\n", pc, native_symbol_name);
     NativeSymbolResolver::FreeSymbolName(native_symbol_name);
   }
 }
 
 
 class ProfilerStackWalker : public ValueObject {
  public:
-  ProfilerStackWalker(Isolate* isolate,
+  ProfilerStackWalker(Dart_Port port_id,
                       Sample* head_sample,
                       SampleBuffer* sample_buffer)
-      : isolate_(isolate),
+      : port_id_(port_id),
         sample_(head_sample),
         sample_buffer_(sample_buffer),
         frame_index_(0),
         total_frames_(0) {
-    ASSERT(isolate_ != NULL);
     if (sample_ == NULL) {
       ASSERT(sample_buffer_ == NULL);
     } else {
       ASSERT(sample_buffer_ != NULL);
       ASSERT(sample_->head_sample());
     }
   }
 
   bool Append(uword pc) {
     if (sample_ == NULL) {
@@ skipping 18 matching lines @@
       sample_ = new_sample;
     }
     ASSERT(frame_index_ < kSampleSize);
     sample_->SetAt(frame_index_, pc);
     frame_index_++;
     total_frames_++;
     return true;
   }
 
  protected:
-  Isolate* isolate_;
+  Dart_Port port_id_;
   Sample* sample_;
   SampleBuffer* sample_buffer_;
   intptr_t frame_index_;
   intptr_t total_frames_;
 };
 
 
 // Executing Dart code, walk the stack.
 class ProfilerDartStackWalker : public ProfilerStackWalker {
  public:
   ProfilerDartStackWalker(Thread* thread,
                           Sample* sample,
                           SampleBuffer* sample_buffer,
                           uword stack_lower,
                           uword stack_upper,
                           uword pc,
                           uword fp,
                           uword sp,
                           bool exited_dart_code,
                           bool allocation_sample)
-      : ProfilerStackWalker(thread->isolate(), sample, sample_buffer),
+      : ProfilerStackWalker((thread->isolate() != NULL)
+                                ? thread->isolate()->main_port()
+                                : ILLEGAL_PORT,
+                            sample,
+                            sample_buffer),
         pc_(reinterpret_cast<uword*>(pc)),
         fp_(reinterpret_cast<uword*>(fp)),
         sp_(reinterpret_cast<uword*>(sp)),
         stack_upper_(stack_upper),
         stack_lower_(stack_lower),
         has_exit_frame_(exited_dart_code) {
     if (exited_dart_code) {
       StackFrameIterator iterator(StackFrameIterator::kDontValidateFrames,
                                   thread);
       pc_ = NULL;
@@ skipping 151 matching lines @@
   bool has_exit_frame_;
 };
 
 
 // If the VM is compiled without frame pointers (which is the default on
 // recent GCC versions with optimizing enabled) the stack walking code may
 // fail.
 //
 class ProfilerNativeStackWalker : public ProfilerStackWalker {
  public:
-  ProfilerNativeStackWalker(Isolate* isolate,
+  ProfilerNativeStackWalker(Dart_Port port_id,
                             Sample* sample,
                             SampleBuffer* sample_buffer,
                             uword stack_lower,
                             uword stack_upper,
                             uword pc,
                             uword fp,
-                            uword sp)
-      : ProfilerStackWalker(isolate, sample, sample_buffer),
+                            uword sp,
+                            intptr_t skip_count = 0)

[Cutch, 2017/02/15 08:21:00]

Support for skip count should be generalized and put into ProfilerStackWalker.

[bkonyi, 2017/02/16 00:28:28]

Done.

+      : ProfilerStackWalker(port_id, sample, sample_buffer),
         stack_upper_(stack_upper),
         original_pc_(pc),
         original_fp_(fp),
         original_sp_(sp),
-        lower_bound_(stack_lower) {}
+        lower_bound_(stack_lower),
+        skip_count_(skip_count) {}
 
   void walk() {
     const uword kMaxStep = VirtualMemory::PageSize();
-    Append(original_pc_);
+    intptr_t frame_count = 0;
+
+    if (frame_count >= skip_count_) {
+      Append(original_pc_);
+    }
+    ++frame_count;
 
     uword* pc = reinterpret_cast<uword*>(original_pc_);
     uword* fp = reinterpret_cast<uword*>(original_fp_);
     uword* previous_fp = fp;
 
     uword gap = original_fp_ - original_sp_;
     if (gap >= kMaxStep) {
       // Gap between frame pointer and stack pointer is
       // too large.
       return;
     }
 
     if (!ValidFramePointer(fp)) {
       return;
     }
 
     while (true) {
-      if (!Append(reinterpret_cast<uword>(pc))) {
+      if (frame_count >= skip_count_ && !Append(reinterpret_cast<uword>(pc))) {

[Cutch, 2017/02/15 08:21:00]

wrap in parens: (frame_count >= skip_count_)

Also, pretty sure you mean || here and not &&.

[bkonyi, 2017/02/16 00:28:29]

Acknowledged.

         return;
       }
 
       pc = CallerPC(fp);
       previous_fp = fp;
       fp = CallerFP(fp);
 
       if (fp == NULL) {
         return;
       }
 
       if (fp <= previous_fp) {
         // Frame pointer did not move to a higher address.
         return;
       }
 
       gap = fp - previous_fp;
       if (gap >= kMaxStep) {
         // Frame pointer step is too large.
         return;
       }
 
       if (!ValidFramePointer(fp)) {
         // Frame pointer is outside of isolate stack boundary.
         return;
       }
 
       // Move the lower bound up.
       lower_bound_ = reinterpret_cast<uword>(fp);
+      ++frame_count;

[Cutch, 2017/02/15 08:21:00]

You should bump frame_count immediately after the Append call succeeds (line
~648)

[bkonyi, 2017/02/16 00:28:29]

Acknowledged.

     }
   }
 
  private:
   uword* CallerPC(uword* fp) const {
     ASSERT(fp != NULL);
     uword* caller_pc_ptr = fp + kSavedCallerPcSlotFromFp;
     // This may actually be uninitialized, by design (see class comment above).
     MSAN_UNPOISON(caller_pc_ptr, kWordSize);
     ASAN_UNPOISON(caller_pc_ptr, kWordSize);
@@ skipping 17 matching lines @@
     cursor += sizeof(fp);
     bool r = (cursor >= lower_bound_) && (cursor < stack_upper_);
     return r;
   }
 
   const uword stack_upper_;
   const uword original_pc_;
   const uword original_fp_;
   const uword original_sp_;
   uword lower_bound_;
+  intptr_t skip_count_;
 };
 
 
 static void CopyStackBuffer(Sample* sample, uword sp_addr) {
   ASSERT(sample != NULL);
   uword* sp = reinterpret_cast<uword*>(sp_addr);
   uword* buffer = sample->GetStackBuffer();
   if (sp != NULL) {
     for (intptr_t i = 0; i < Sample::kStackBufferSizeInWords; i++) {
       MSAN_UNPOISON(sp, kWordSize);
@@ skipping 79 matching lines @@
     USE(success);
     ASSERT(success);
     ASSERT(old_protect == PAGE_READWRITE);
   }
 #endif
 }
 
 
 // Get |isolate|'s stack boundary and verify that |sp| and |fp| are within
 // it. Return |false| if anything looks suspicious.
-static bool GetAndValidateIsolateStackBounds(Thread* thread,
-                                             uintptr_t fp,
-                                             uintptr_t sp,
-                                             uword* stack_lower,
-                                             uword* stack_upper) {
-  ASSERT(thread != NULL);
-  OSThread* os_thread = thread->os_thread();
+static bool GetAndValidateStackBounds(Thread* thread,

[Cutch, 2017/02/15 08:21:00]

Seems like a bad merge here.

Please see this CL: https://codereview.chromium.org/2680123004/  (which landed a
few days ago). It introduces a replacement called
GetAndValidateThreadStackBounds. Your code should call that.

[bkonyi, 2017/02/16 00:28:29]

Not a bad merge, just haven't rebased in awhile. Done.

+                                      uintptr_t fp,
+                                      uintptr_t sp,
+                                      uword* stack_lower,
+                                      uword* stack_upper) {
+  OSThread* os_thread = NULL;
+  if (thread != NULL) {
+    os_thread = thread->os_thread();
+  } else {
+    os_thread = OSThread::Current();
+  }
   ASSERT(os_thread != NULL);
   ASSERT(stack_lower != NULL);
   ASSERT(stack_upper != NULL);
 #if defined(USING_SIMULATOR)
-  const bool in_dart_code = thread->IsExecutingDartCode();
+  const bool in_dart_code =
+      (thread == NULL) ? false : thread->IsExecutingDartCode();
   if (in_dart_code) {
     Isolate* isolate = thread->isolate();
     ASSERT(isolate != NULL);
     Simulator* simulator = isolate->simulator();
     *stack_lower = simulator->StackBase();
     *stack_upper = simulator->StackTop();
   } else if (!os_thread->GetProfilerStackBounds(stack_lower, stack_upper)) {
     // Could not get stack boundary.
     return false;
   }
@@ skipping 56 matching lines @@
 }
 
 
 static Sample* SetupSample(Thread* thread,
                            SampleBuffer* sample_buffer,
                            ThreadId tid) {
   ASSERT(thread != NULL);
   Isolate* isolate = thread->isolate();
   ASSERT(sample_buffer != NULL);
   Sample* sample = sample_buffer->ReserveSample();
-  sample->Init(isolate, OS::GetCurrentMonotonicMicros(), tid);
+  sample->Init(isolate->main_port(), OS::GetCurrentMonotonicMicros(), tid);
   uword vm_tag = thread->vm_tag();
 #if defined(USING_SIMULATOR) && !defined(TARGET_ARCH_DBC)
   // When running in the simulator, the runtime entry function address
   // (stored as the vm tag) is the address of a redirect function.
   // Attempt to find the real runtime entry function address and use that.
   uword redirect_vm_tag = Simulator::FunctionForRedirect(vm_tag);
   if (redirect_vm_tag != 0) {
     vm_tag = redirect_vm_tag;
   }
 #endif
   sample->set_vm_tag(vm_tag);
   sample->set_user_tag(isolate->user_tag());
   sample->set_thread_task(thread->task_kind());
   return sample;
 }
 
 
+static Sample* SetupSampleNative(SampleBuffer* sample_buffer, ThreadId tid) {
+  Sample* sample = sample_buffer->ReserveSample();
+  sample->Init(ILLEGAL_PORT, OS::GetCurrentMonotonicMicros(), tid);
+  sample->set_is_native_allocation_sample(true);
+
+  Thread* thread = Thread::Current();
+
+  // TODO(bkonyi) Any samples created while a current thread doesn't exist are
+  // ignored by the NativeAllocationSampleFilter since the default task is
+  // kUnknownTask. Is this what we want to do?
+  if (thread != NULL) {
+    sample->set_thread_task(thread->task_kind());
+  }
+  return sample;
+}
+
+
 static bool CheckIsolate(Isolate* isolate) {
   if ((isolate == NULL) || (Dart::vm_isolate() == NULL)) {
     // No isolate.
     return false;
   }
   return isolate != Dart::vm_isolate();
 }
 
 
 #if defined(TARGET_OS_WINDOWS)
@@ skipping 58 matching lines @@
                OSThread::ThreadIdToIntPtr(os_thread->trace_id()));
 
   uword stack_lower = 0;
   uword stack_upper = 0;
 
   if (!InitialRegisterCheck(pc, fp, sp)) {
     OS::PrintErr("Stack dump aborted because InitialRegisterCheck.\n");
     return;
   }
 
-  if (!GetAndValidateIsolateStackBounds(thread, fp, sp, &stack_lower,
-                                        &stack_upper)) {
-    OS::PrintErr(
-        "Stack dump aborted because GetAndValidateIsolateStackBounds.\n");
+  if (!GetAndValidateStackBounds(thread, fp, sp, &stack_lower, &stack_upper)) {
+    OS::PrintErr("Stack dump aborted because GetAndValidateStackBounds.\n");
     return;
   }
 
   ProfilerNativeStackWalker native_stack_walker(
-      isolate, NULL, NULL, stack_lower, stack_upper, pc, fp, sp);
+      (isolate != NULL) ? isolate->main_port() : ILLEGAL_PORT, NULL, NULL,
+      stack_lower, stack_upper, pc, fp, sp);
   native_stack_walker.walk();
   OS::PrintErr("-- End of DumpStackTrace\n");
 }
 
 
 void Profiler::SampleAllocation(Thread* thread, intptr_t cid) {
   ASSERT(thread != NULL);
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   Isolate* isolate = thread->isolate();
@@ skipping 15 matching lines @@
 
   COPY_FP_REGISTER(fp);
 
   uword stack_lower = 0;
   uword stack_upper = 0;
 
   if (!InitialRegisterCheck(pc, fp, sp)) {
     return;
   }
 
-  if (!GetAndValidateIsolateStackBounds(thread, fp, sp, &stack_lower,
-                                        &stack_upper)) {
+  if (!GetAndValidateStackBounds(thread, fp, sp, &stack_lower, &stack_upper)) {
     // Could not get stack boundary.
     return;
   }
 
   Sample* sample = SetupSample(thread, sample_buffer, os_thread->trace_id());
   sample->SetAllocationCid(cid);
 
   if (FLAG_profile_vm) {
     ProfilerNativeStackWalker native_stack_walker(
-        isolate, sample, sample_buffer, stack_lower, stack_upper, pc, fp, sp);
+        (isolate != NULL) ? isolate->main_port() : ILLEGAL_PORT, sample,
+        sample_buffer, stack_lower, stack_upper, pc, fp, sp);
     native_stack_walker.walk();
   } else if (exited_dart_code) {
     ProfilerDartStackWalker dart_exit_stack_walker(
         thread, sample, sample_buffer, stack_lower, stack_upper, pc, fp, sp,
         exited_dart_code, true);
     dart_exit_stack_walker.walk();
   } else {
     // Fall back.
     uintptr_t pc = GetProgramCounter();
     Sample* sample = SetupSample(thread, sample_buffer, os_thread->trace_id());
     sample->SetAllocationCid(cid);
     sample->SetAt(0, pc);
   }
 }
 
 
+Sample* Profiler::SampleNativeAllocation(intptr_t skip_count) {
+  SampleBuffer* sample_buffer = Profiler::sample_buffer();
+  if (sample_buffer == NULL) {
+    return NULL;
+  }
+
+  uintptr_t sp = Thread::GetCurrentStackPointer();
+  uintptr_t fp = 0;
+  uintptr_t pc = GetProgramCounter();
+
+  COPY_FP_REGISTER(fp);
+
+  uword stack_lower = 0;
+  uword stack_upper = 0;
+  if (!InitialRegisterCheck(pc, fp, sp)) {
+    return NULL;
+  }
+
+  OSThread* os_thread = OSThread::Current();
+  if (os_thread->stack_base() == 0) {
+    stack_lower = sp;
+    stack_upper = ~static_cast<uintptr_t>(0x0);
+  } else {
+    if (!GetAndValidateStackBounds(NULL, fp, sp, &stack_lower, &stack_upper)) {
+      // Could not get stack boundary.
+      return NULL;
+    }
+  }
+  Sample* sample = SetupSampleNative(sample_buffer, os_thread->trace_id());
+  ProfilerNativeStackWalker native_stack_walker(
+      ILLEGAL_PORT, sample, sample_buffer, stack_lower, stack_upper, pc, fp, sp,
+      skip_count);
+  native_stack_walker.walk();
+  return sample;
+}
+
+
 void Profiler::SampleThreadSingleFrame(Thread* thread, uintptr_t pc) {
   ASSERT(thread != NULL);
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   Isolate* isolate = thread->isolate();
 
   SampleBuffer* sample_buffer = Profiler::sample_buffer();
   if (sample_buffer == NULL) {
     // Profiler not initialized.
     return;
@@ skipping 78 matching lines @@
 
   if (!InitialRegisterCheck(pc, fp, sp)) {
     AtomicOperations::IncrementInt64By(
         &counters_.single_frame_sample_register_check, 1);
     SampleThreadSingleFrame(thread, pc);
     return;
   }
 
   uword stack_lower = 0;
   uword stack_upper = 0;
-  if (!GetAndValidateIsolateStackBounds(thread, fp, sp, &stack_lower,
-                                        &stack_upper)) {
+  if (!GetAndValidateStackBounds(thread, fp, sp, &stack_lower, &stack_upper)) {
     AtomicOperations::IncrementInt64By(
         &counters_.single_frame_sample_get_and_validate_stack_bounds, 1);
     // Could not get stack boundary.
     SampleThreadSingleFrame(thread, pc);
     return;
   }
 
   // At this point we have a valid stack boundary for this isolate and
   // know that our initial stack and frame pointers are within the boundary.
   SampleBuffer* sample_buffer = Profiler::sample_buffer();
   if (sample_buffer == NULL) {
     // Profiler not initialized.
     return;
   }
 
   // Setup sample.
   Sample* sample = SetupSample(thread, sample_buffer, os_thread->trace_id());
   // Increment counter for vm tag.
   VMTagCounters* counters = isolate->vm_tag_counters();
   ASSERT(counters != NULL);
   if (thread->IsMutatorThread()) {
     counters->Increment(sample->vm_tag());
   }
 
   ProfilerNativeStackWalker native_stack_walker(
-      isolate, sample, sample_buffer, stack_lower, stack_upper, pc, fp, sp);
+      (isolate != NULL) ? isolate->main_port() : ILLEGAL_PORT, sample,
+      sample_buffer, stack_lower, stack_upper, pc, fp, sp);
   const bool exited_dart_code = thread->HasExitedDartCode();
   ProfilerDartStackWalker dart_stack_walker(thread, sample, sample_buffer,
                                             stack_lower, stack_upper, pc, fp,
                                             sp, exited_dart_code, false);
 
   // All memory access is done inside CollectSample.
   CollectSample(isolate, exited_dart_code, in_dart_code, sample,
                 &native_stack_walker, &dart_stack_walker, pc, fp, sp,
                 &counters_);
 }
@@ skipping 139 matching lines @@
   for (intptr_t i = 0; i < length; i++) {
     Sample* sample = At(i);
     if (sample->ignore_sample()) {
       // Bad sample.
       continue;
     }
     if (!sample->head_sample()) {
       // An inner sample in a chain of samples.
       continue;
     }
-    if (sample->isolate() != filter->isolate()) {
+    // If we're requesting all the native allocation samples, we don't care
+    // whether or not we're in the same isolate as the sample.
+    if (sample->port() != filter->port() &&

[Cutch, 2017/02/15 08:21:00]

wrap in parens: (sample->port() != filter->port())

[bkonyi, 2017/02/16 00:28:29]

Done.

+        !sample->is_native_allocation_sample()) {
       // Another isolate.
       continue;
     }
     if (sample->timestamp() == 0) {
       // Empty.
       continue;
     }
     if (sample->At(0) == 0) {
       // No frames.
       continue;
@@ skipping 58 matching lines @@
   return processed_sample;
 }
 
 
 Sample* SampleBuffer::Next(Sample* sample) {
   if (!sample->is_continuation_sample()) return NULL;
   Sample* next_sample = At(sample->continuation_index());
   // Sanity check.
   ASSERT(sample != next_sample);
   // Detect invalid chaining.
-  if (sample->isolate() != next_sample->isolate()) {
+  if (sample->port() != next_sample->port()) {
     return NULL;
   }
   if (sample->timestamp() != next_sample->timestamp()) {
     return NULL;
   }
   if (sample->tid() != next_sample->tid()) {
     return NULL;
   }
   return next_sample;
 }
@@ skipping 81 matching lines @@
 
 
 ProcessedSampleBuffer::ProcessedSampleBuffer()
     : code_lookup_table_(new CodeLookupTable(Thread::Current())) {
   ASSERT(code_lookup_table_ != NULL);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart