Revert "Switch profiler from isolates to threads"

runtime/vm/profiler_service.cc

 // Copyright (c) 2015, 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 "vm/profiler_service.h"
 
 #include "vm/growable_array.h"
 #include "vm/native_symbol.h"
 #include "vm/object.h"
 #include "vm/os.h"
@@ skipping 1033 matching lines @@
     RegisterProfileCodeTag(VMTag::kNoneCodeTagId);
     RegisterProfileCodeTag(VMTag::kOptimizedCodeTagId);
     RegisterProfileCodeTag(VMTag::kUnoptimizedCodeTagId);
     RegisterProfileCodeTag(VMTag::kNativeCodeTagId);
     RegisterProfileCodeTag(VMTag::kInlineStartCodeTagId);
     RegisterProfileCodeTag(VMTag::kInlineEndCodeTagId);
   }
 
   void FilterSamples() {
     ScopeTimer sw("ProfileBuilder::FilterSamples", FLAG_trace_profiler);
-    SampleBuffer* sample_buffer = Profiler::sample_buffer();
+    Isolate* isolate = thread_->isolate();
+    MutexLocker profiler_data_lock(isolate->profiler_data_mutex());
+    IsolateProfilerData* profiler_data = isolate->profiler_data();
+    if (profiler_data == NULL) {
+      return;
+    }
+    SampleBuffer* sample_buffer = profiler_data->sample_buffer();
     if (sample_buffer == NULL) {
       return;
     }
     samples_ = sample_buffer->BuildProcessedSampleBuffer(filter_);
     profile_->sample_count_ = samples_->length();
   }
 
   void UpdateMinMaxTimes(int64_t timestamp) {
     profile_->min_time_ =
         timestamp < profile_->min_time_ ? timestamp : profile_->min_time_;
@@ skipping 1141 matching lines @@
   return parent_->NumChildren();
 }
 
 
 void ProfilerService::PrintJSONImpl(Thread* thread,
                                     JSONStream* stream,
                                     Profile::TagOrder tag_order,
                                     intptr_t extra_tags,
                                     SampleFilter* filter) {
   Isolate* isolate = thread->isolate();
-  // Disable thread interrupts while processing the buffer.
-  DisableThreadInterruptsScope dtis(thread);
+  // Disable profile interrupts while processing the buffer.
+  Profiler::EndExecution(isolate);
 
-  SampleBuffer* sample_buffer = Profiler::sample_buffer();
-  if (sample_buffer == NULL) {
-    stream->PrintError(kFeatureDisabled, NULL);
-    return;
+  {
+    MutexLocker profiler_data_lock(isolate->profiler_data_mutex());
+    IsolateProfilerData* profiler_data = isolate->profiler_data();
+    if (profiler_data == NULL) {
+      stream->PrintError(kFeatureDisabled, NULL);
+      return;
+    }
   }
 
   {
     StackZone zone(thread);
     HANDLESCOPE(thread);
     Profile profile(isolate);
     profile.Build(thread, filter, tag_order, extra_tags);
     profile.PrintJSON(stream);
   }
+
+  // Enable profile interrupts.
+  Profiler::BeginExecution(isolate);
 }
 
 
 class NoAllocationSampleFilter : public SampleFilter {
  public:
   explicit NoAllocationSampleFilter(Isolate* isolate)
       : SampleFilter(isolate) {
   }
 
   bool FilterSample(Sample* sample) {
@@ skipping 34 matching lines @@
                                           Profile::TagOrder tag_order,
                                           const Class& cls) {
   Thread* thread = Thread::Current();
   Isolate* isolate = thread->isolate();
   ClassAllocationSampleFilter filter(isolate, cls);
   PrintJSONImpl(thread, stream, tag_order, kNoExtraTags, &filter);
 }
 
 
 void ProfilerService::ClearSamples() {
-  SampleBuffer* sample_buffer = Profiler::sample_buffer();
-  if (sample_buffer == NULL) {
+  Isolate* isolate = Isolate::Current();
+
+  // Disable profile interrupts while processing the buffer.
+  Profiler::EndExecution(isolate);
+
+  MutexLocker profiler_data_lock(isolate->profiler_data_mutex());
+  IsolateProfilerData* profiler_data = isolate->profiler_data();
+  if (profiler_data == NULL) {
     return;
   }
-
-  Thread* thread = Thread::Current();
-  Isolate* isolate = thread->isolate();
-
-  // Disable thread interrupts while processing the buffer.
-  DisableThreadInterruptsScope dtis(thread);
+  SampleBuffer* sample_buffer = profiler_data->sample_buffer();
+  ASSERT(sample_buffer != NULL);
 
   ClearProfileVisitor clear_profile(isolate);
   sample_buffer->VisitSamples(&clear_profile);
+
+  // Enable profile interrupts.
+  Profiler::BeginExecution(isolate);
 }
 
 }  // namespace dart