| Index: runtime/vm/profiler_service.cc
|
| diff --git a/runtime/vm/profiler_service.cc b/runtime/vm/profiler_service.cc
|
| index 7ea7d3b129cc138ebf54bb7b7f3494861c74cffb..dc500fbe07411c372713b879467a92389269c692 100644
|
| --- a/runtime/vm/profiler_service.cc
|
| +++ b/runtime/vm/profiler_service.cc
|
| @@ -1051,13 +1051,7 @@ class ProfileBuilder : public ValueObject {
|
|
|
| void FilterSamples() {
|
| ScopeTimer sw("ProfileBuilder::FilterSamples", FLAG_trace_profiler);
|
| - 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();
|
| + SampleBuffer* sample_buffer = Profiler::sample_buffer();
|
| if (sample_buffer == NULL) {
|
| return;
|
| }
|
| @@ -2205,13 +2199,10 @@ void ProfilerService::PrintJSONImpl(Thread* thread,
|
| // 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) {
|
| - stream->PrintError(kFeatureDisabled, NULL);
|
| - return;
|
| - }
|
| + SampleBuffer* sample_buffer = Profiler::sample_buffer();
|
| + if (sample_buffer == NULL) {
|
| + stream->PrintError(kFeatureDisabled, NULL);
|
| + return;
|
| }
|
|
|
| {
|
| @@ -2283,13 +2274,10 @@ void ProfilerService::ClearSamples() {
|
| // 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) {
|
| + SampleBuffer* sample_buffer = Profiler::sample_buffer();
|
| + if (sample_buffer == NULL) {
|
| return;
|
| }
|
| - SampleBuffer* sample_buffer = profiler_data->sample_buffer();
|
| - ASSERT(sample_buffer != NULL);
|
|
|
| ClearProfileVisitor clear_profile(isolate);
|
| sample_buffer->VisitSamples(&clear_profile);
|
|
|