Profiler fixes

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 <cstdio>
 
 #include "platform/utils.h"
 
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
@@ skipping 50 matching lines @@
 
 // Notes on stack frame walking:
 //
 // The sampling profiler will collect up to Sample::kNumStackFrames stack frames
 // The stack frame walking code uses the frame pointer to traverse the stack.
 // If the VM is compiled without frame pointers (which is the default on
 // recent GCC versions with optimizing enabled) the stack walking code will
 // fail (sometimes leading to a crash).
 //
 
-
 DEFINE_FLAG(bool, profile, true, "Enable Sampling Profiler");
 DEFINE_FLAG(bool, trace_profiled_isolates, false, "Trace profiled isolates.");
 
 bool ProfilerManager::initialized_ = false;
 bool ProfilerManager::shutdown_ = false;
 Monitor* ProfilerManager::monitor_ = NULL;
 Isolate** ProfilerManager::isolates_ = NULL;
 intptr_t ProfilerManager::isolates_capacity_ = 0;
 intptr_t ProfilerManager::isolates_size_ = 0;
 
 
 void ProfilerManager::InitOnce() {
+#if defined(USING_SIMULATOR)
+  // Force disable of profiling on simulator.
+  FLAG_profile = false;
+#endif
   if (!FLAG_profile) {
     return;
   }
   NativeSymbolResolver::InitOnce();
   ASSERT(!initialized_);
   monitor_ = new Monitor();
   initialized_ = true;
   ResizeIsolates(16);
   Thread::Start(ThreadMain, 0);
 }
@@ skipping 22 matching lines @@
 void ProfilerManager::SetupIsolateForProfiling(Isolate* isolate) {
   if (!FLAG_profile) {
     return;
   }
   ASSERT(isolate != NULL);
   {
     ScopedSignalBlocker ssb;
     {
       ScopedMutex profiler_data_lock(isolate->profiler_data_mutex());
       SampleBuffer* sample_buffer = new SampleBuffer();
+      ASSERT(sample_buffer != NULL);
       IsolateProfilerData* profiler_data =
           new IsolateProfilerData(isolate, sample_buffer);
+      ASSERT(profiler_data != NULL);
       profiler_data->set_sample_interval_micros(1000);
       isolate->set_profiler_data(profiler_data);
       if (FLAG_trace_profiled_isolates) {
         OS::Print("PROF SETUP %p %s %p\n",
             isolate,
             isolate->name(),
             reinterpret_cast<void*>(Thread::GetCurrentThreadId()));
       }
     }
   }
 }
 
 
 void ProfilerManager::FreeIsolateProfilingData(Isolate* isolate) {
   ScopedMutex profiler_data_lock(isolate->profiler_data_mutex());
   IsolateProfilerData* profiler_data = isolate->profiler_data();
   if (profiler_data == NULL) {
     // Already freed.
     return;
   }
   isolate->set_profiler_data(NULL);
   SampleBuffer* sample_buffer = profiler_data->sample_buffer();
   ASSERT(sample_buffer != NULL);
+  profiler_data->set_sample_buffer(NULL);
   delete sample_buffer;
   delete profiler_data;
   if (FLAG_trace_profiled_isolates) {
     OS::Print("PROF SHUTDOWN %p %s %p\n", isolate,
         isolate->name(), reinterpret_cast<void*>(Thread::GetCurrentThreadId()));
   }
 }
 
 
 void ProfilerManager::ShutdownIsolateForProfiling(Isolate* isolate) {
@@ skipping 360 matching lines @@
   }
   vm_tags = kIdle;
   runtime_tags = 0;
 }
 
 
 SampleBuffer::SampleBuffer(intptr_t capacity) {
   start_ = 0;
   end_ = 0;
   capacity_ = capacity;
-  samples_ = reinterpret_cast<Sample*>(calloc(capacity, sizeof(Sample)));
+  samples_ = new Sample[capacity];
 }
 
 
 SampleBuffer::~SampleBuffer() {
   if (samples_ != NULL) {
-    free(samples_);
+    delete[] samples_;
     samples_ = NULL;
   }
 }
 
 
 Sample* SampleBuffer::ReserveSample() {
+  ASSERT(samples_ != NULL);
   intptr_t index = end_;
   end_ = WrapIncrement(end_);
   if (end_ == start_) {
     start_ = WrapIncrement(start_);
   }
+  ASSERT(index >= 0);
+  ASSERT(index < capacity_);
   // Reset.
   samples_[index] = Sample();
   return &samples_[index];
 }
 
 
 Sample* SampleBuffer::FirstSample() const {
   return &samples_[start_];
 }
 
@@ skipping 85 matching lines @@
     return false;
   }
   uintptr_t cursor = reinterpret_cast<uintptr_t>(fp);
   cursor += sizeof(fp);
   bool r = cursor >= lower_bound_ && cursor < stack_upper_;
   return r;
 }
 
 
 }  // namespace dart