Profiler tweaks

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/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
 #include "vm/code_patcher.h"
 #include "vm/isolate.h"
@@ skipping 1024 matching lines @@
     }
     // Make sure VM tag is created.
     if (VMTag::IsNativeEntryTag(sample->vm_tag())) {
       CreateTag(VMTag::kNativeTagId);
     } else if (VMTag::IsRuntimeEntryTag(sample->vm_tag())) {
       CreateTag(VMTag::kRuntimeTagId);
     }
     CreateTag(sample->vm_tag());
     // Make sure user tag is created.
     CreateUserTag(sample->user_tag());
-    // Exclusive tick for bottom frame.
-    Tick(sample->At(0), true, timestamp);
+    // Exclusive tick for bottom frame if we aren't sampled from an exit frame.
+    if (!sample->exit_frame_sample()) {
+      Tick(sample->At(0), true, timestamp);
+    }
     // Inclusive tick for all frames.
     for (intptr_t i = 0; i < FLAG_profile_depth; i++) {
       if (sample->At(i) == 0) {
         break;
       }
       frames_++;
       Tick(sample->At(i), false, timestamp);
     }
   }
 
@@ skipping 627 matching lines @@
 }
 
 
 // Given an exit frame, walk the Dart stack.
 class ProfilerDartExitStackWalker : public ValueObject {
  public:
   ProfilerDartExitStackWalker(Isolate* isolate, Sample* sample)
       : sample_(sample),
         frame_iterator_(isolate) {
     ASSERT(sample_ != NULL);
+    // Mark that this sample was collected from an exit frame.
+    sample_->set_exit_frame_sample(true);
   }
 
   void walk() {
     intptr_t frame_index = 0;
     StackFrame* frame = frame_iterator_.NextFrame();
     while (frame != NULL) {
       sample_->SetAt(frame_index, frame->pc());
       frame_index++;
       if (frame_index >= FLAG_profile_depth) {
         break;
@@ skipping 344 matching lines @@
                                           stack_upper,
                                           state.pc,
                                           state.fp,
                                           state.sp);
     stackWalker.walk();
   } else {
     // Attempt to walk only the Dart call stack, falling back to walking
     // the native stack.
     if ((isolate->stub_code() != NULL) &&
         (isolate->top_exit_frame_info() != 0) &&
-        (isolate->vm_tag() != VMTag::kScriptTagId)) {
+        (isolate->vm_tag() != VMTag::kDartTagId)) {
       // We have a valid exit frame info, use the Dart stack walker.
       ProfilerDartExitStackWalker stackWalker(isolate, sample);
       stackWalker.walk();
     } else if ((isolate->stub_code() != NULL) &&
                (isolate->top_exit_frame_info() == 0) &&
-               (isolate->vm_tag() == VMTag::kScriptTagId)) {
+               (isolate->vm_tag() == VMTag::kDartTagId)) {
       // We are executing Dart code. We have frame pointers.
       ProfilerDartStackWalker stackWalker(isolate,
                                           sample,
                                           stack_lower,
                                           stack_upper,
                                           state.pc,
                                           state.fp,
                                           state.sp);
       stackWalker.walk();
     } else {
       // Fall back to an extremely conservative stack walker.
       ProfilerNativeStackWalker stackWalker(sample,
                                             stack_lower,
                                             stack_upper,
                                             state.pc,
                                             state.fp,
                                             state.sp);
       stackWalker.walk();
     }
   }
 }
 
 }  // namespace dart