Enable the profiler on the simulator

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"
 #include "vm/json_stream.h"
 #include "vm/lockers.h"
 #include "vm/native_symbol.h"
 #include "vm/object.h"
 #include "vm/os.h"
 #include "vm/profiler.h"
 #include "vm/reusable_handles.h"
 #include "vm/signal_handler.h"
 #include "vm/simulator.h"
 #include "vm/stack_frame.h"
 
 namespace dart {
 
 
-#if defined(USING_SIMULATOR) || defined(TARGET_OS_ANDROID) || \
-    defined(HOST_ARCH_ARM64)
+#if defined(TARGET_OS_ANDROID) || defined(HOST_ARCH_ARM64)
   DEFINE_FLAG(bool, profile, false, "Enable Sampling Profiler");
 #else
   DEFINE_FLAG(bool, profile, true, "Enable Sampling Profiler");
 #endif
 DEFINE_FLAG(bool, trace_profiled_isolates, false, "Trace profiled isolates.");
 DEFINE_FLAG(charp, profile_dir, NULL,
             "Enable writing profile data into specified directory.");
 DEFINE_FLAG(int, profile_period, 1000,
             "Time between profiler samples in microseconds. Minimum 50.");
 DEFINE_FLAG(int, profile_depth, 8,
             "Maximum number stack frames walked. Minimum 1. Maximum 255.");
-#if defined(PROFILE_NATIVE_CODE)
+#if defined(PROFILE_NATIVE_CODE) || defined(USING_SIMULATOR)
 DEFINE_FLAG(bool, profile_vm, true,
             "Always collect native stack traces.");
 #else
 DEFINE_FLAG(bool, profile_vm, false,
             "Always collect native stack traces.");
 #endif
 
 bool Profiler::initialized_ = false;
 SampleBuffer* Profiler::sample_buffer_ = NULL;
 
@@ skipping 1984 matching lines @@
   }
 
   if ((state.fp < stack_lower) || (state.fp >= stack_upper)) {
     // Frame pointer is outside isolate stack boundary.
     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.
 
-  // Increment counter for vm tag.
-  VMTagCounters* counters = isolate->vm_tag_counters();
-  ASSERT(counters != NULL);
-  counters->Increment(isolate->vm_tag());
-
   // Setup sample.
   Sample* sample = sample_buffer->ReserveSample();
   sample->Init(isolate, OS::GetCurrentTimeMicros(), state.tid);
-  sample->set_vm_tag(isolate->vm_tag());
+  uword vm_tag = isolate->vm_tag();
+#if defined(USING_SIMULATOR)
+  // 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
+  // Increment counter for vm tag.
+  VMTagCounters* counters = isolate->vm_tag_counters();
+  ASSERT(counters != NULL);
+  counters->Increment(vm_tag);
+  sample->set_vm_tag(vm_tag);
   sample->set_user_tag(isolate->user_tag());
   sample->set_sp(sp);
   sample->set_fp(state.fp);
 #if !(defined(TARGET_OS_WINDOWS) && defined(TARGET_ARCH_X64))
   // It is never safe to read other thread's stack unless on Win64
   // other thread is inside Dart code.
   SetPCMarkerIfSafe(sample);
 #endif
 
   // Walk the call stack.
@@ skipping 40 matching lines @@
                                             state.pc,
                                             state.fp,
                                             sp);
       stackWalker.walk();
 #endif
     }
   }
 }
 
 }  // namespace dart