| Index: runtime/vm/profiler_service.cc
|
| diff --git a/runtime/vm/profiler_service.cc b/runtime/vm/profiler_service.cc
|
| index 6731e2d91d8f167723070a34cc0871c441943999..495e8aed018cb15a2a3cf8c8bcfbf4c81a0eae97 100644
|
| --- a/runtime/vm/profiler_service.cc
|
| +++ b/runtime/vm/profiler_service.cc
|
| @@ -2670,11 +2670,11 @@ void ProfilerService::PrintJSONImpl(Thread* thread,
|
|
|
| class NoAllocationSampleFilter : public SampleFilter {
|
| public:
|
| - NoAllocationSampleFilter(Isolate* isolate,
|
| + NoAllocationSampleFilter(Dart_Port port,
|
| intptr_t thread_task_mask,
|
| int64_t time_origin_micros,
|
| int64_t time_extent_micros)
|
| - : SampleFilter(isolate,
|
| + : SampleFilter(port,
|
| thread_task_mask,
|
| time_origin_micros,
|
| time_extent_micros) {}
|
| @@ -2690,7 +2690,7 @@ void ProfilerService::PrintJSON(JSONStream* stream,
|
| int64_t time_extent_micros) {
|
| Thread* thread = Thread::Current();
|
| Isolate* isolate = thread->isolate();
|
| - NoAllocationSampleFilter filter(isolate, Thread::kMutatorTask,
|
| + NoAllocationSampleFilter filter(isolate->main_port(), Thread::kMutatorTask,
|
| time_origin_micros, time_extent_micros);
|
| const bool as_timeline = false;
|
| PrintJSONImpl(thread, stream, tag_order, extra_tags, &filter, as_timeline);
|
| @@ -2699,12 +2699,12 @@ void ProfilerService::PrintJSON(JSONStream* stream,
|
|
|
| class ClassAllocationSampleFilter : public SampleFilter {
|
| public:
|
| - ClassAllocationSampleFilter(Isolate* isolate,
|
| + ClassAllocationSampleFilter(Dart_Port port,
|
| const Class& cls,
|
| intptr_t thread_task_mask,
|
| int64_t time_origin_micros,
|
| int64_t time_extent_micros)
|
| - : SampleFilter(isolate,
|
| + : SampleFilter(port,
|
| thread_task_mask,
|
| time_origin_micros,
|
| time_extent_micros),
|
| @@ -2729,8 +2729,9 @@ void ProfilerService::PrintAllocationJSON(JSONStream* stream,
|
| int64_t time_extent_micros) {
|
| Thread* thread = Thread::Current();
|
| Isolate* isolate = thread->isolate();
|
| - ClassAllocationSampleFilter filter(isolate, cls, Thread::kMutatorTask,
|
| - time_origin_micros, time_extent_micros);
|
| + ClassAllocationSampleFilter filter(isolate->main_port(), cls,
|
| + Thread::kMutatorTask, time_origin_micros,
|
| + time_extent_micros);
|
| const bool as_timeline = false;
|
| PrintJSONImpl(thread, stream, tag_order, kNoExtraTags, &filter, as_timeline);
|
| }
|
| @@ -2745,8 +2746,8 @@ void ProfilerService::PrintTimelineJSON(JSONStream* stream,
|
| const intptr_t thread_task_mask = Thread::kMutatorTask |
|
| Thread::kCompilerTask |
|
| Thread::kSweeperTask | Thread::kMarkerTask;
|
| - NoAllocationSampleFilter filter(isolate, thread_task_mask, time_origin_micros,
|
| - time_extent_micros);
|
| + NoAllocationSampleFilter filter(isolate->main_port(), thread_task_mask,
|
| + time_origin_micros, time_extent_micros);
|
| const bool as_timeline = true;
|
| PrintJSONImpl(thread, stream, tag_order, kNoExtraTags, &filter, as_timeline);
|
| }
|
|
|