OLD | NEW |
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/service.h" | 5 #include "vm/service.h" |
6 | 6 |
7 #include "include/dart_api.h" | 7 #include "include/dart_api.h" |
8 #include "include/dart_native_api.h" | 8 #include "include/dart_native_api.h" |
9 #include "platform/globals.h" | 9 #include "platform/globals.h" |
10 | 10 |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "vm/safepoint.h" | 33 #include "vm/safepoint.h" |
34 #include "vm/service_event.h" | 34 #include "vm/service_event.h" |
35 #include "vm/service_isolate.h" | 35 #include "vm/service_isolate.h" |
36 #include "vm/source_report.h" | 36 #include "vm/source_report.h" |
37 #include "vm/stack_frame.h" | 37 #include "vm/stack_frame.h" |
38 #include "vm/symbols.h" | 38 #include "vm/symbols.h" |
39 #include "vm/timeline.h" | 39 #include "vm/timeline.h" |
40 #include "vm/type_table.h" | 40 #include "vm/type_table.h" |
41 #include "vm/unicode.h" | 41 #include "vm/unicode.h" |
42 #include "vm/version.h" | 42 #include "vm/version.h" |
| 43 #include "vm/kernel_isolate.h" |
43 | 44 |
44 namespace dart { | 45 namespace dart { |
45 | 46 |
46 #define Z (T->zone()) | 47 #define Z (T->zone()) |
47 | 48 |
48 | 49 |
49 DECLARE_FLAG(bool, trace_service); | 50 DECLARE_FLAG(bool, trace_service); |
50 DECLARE_FLAG(bool, trace_service_pause_events); | 51 DECLARE_FLAG(bool, trace_service_pause_events); |
51 DECLARE_FLAG(bool, profile_vm); | 52 DECLARE_FLAG(bool, profile_vm); |
52 DEFINE_FLAG(charp, | 53 DEFINE_FLAG(charp, |
(...skipping 3722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3775 return true; | 3776 return true; |
3776 } | 3777 } |
3777 | 3778 |
3778 | 3779 |
3779 class ServiceIsolateVisitor : public IsolateVisitor { | 3780 class ServiceIsolateVisitor : public IsolateVisitor { |
3780 public: | 3781 public: |
3781 explicit ServiceIsolateVisitor(JSONArray* jsarr) : jsarr_(jsarr) {} | 3782 explicit ServiceIsolateVisitor(JSONArray* jsarr) : jsarr_(jsarr) {} |
3782 virtual ~ServiceIsolateVisitor() {} | 3783 virtual ~ServiceIsolateVisitor() {} |
3783 | 3784 |
3784 void VisitIsolate(Isolate* isolate) { | 3785 void VisitIsolate(Isolate* isolate) { |
3785 if (!IsVMInternalIsolate(isolate)) { | 3786 bool is_kernel_isolate = false; |
| 3787 #ifndef DART_PRECOMPILED_RUNTIME |
| 3788 is_kernel_isolate = KernelIsolate::IsKernelIsolate(isolate); |
| 3789 #endif |
| 3790 if (!IsVMInternalIsolate(isolate) && !is_kernel_isolate) { |
3786 jsarr_->AddValue(isolate); | 3791 jsarr_->AddValue(isolate); |
3787 } | 3792 } |
3788 } | 3793 } |
3789 | 3794 |
3790 private: | 3795 private: |
3791 JSONArray* jsarr_; | 3796 JSONArray* jsarr_; |
3792 }; | 3797 }; |
3793 | 3798 |
3794 | 3799 |
3795 static const MethodParameter* get_vm_params[] = { | 3800 static const MethodParameter* get_vm_params[] = { |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4144 if (strcmp(method_name, method.name) == 0) { | 4149 if (strcmp(method_name, method.name) == 0) { |
4145 return &method; | 4150 return &method; |
4146 } | 4151 } |
4147 } | 4152 } |
4148 return NULL; | 4153 return NULL; |
4149 } | 4154 } |
4150 | 4155 |
4151 #endif // !PRODUCT | 4156 #endif // !PRODUCT |
4152 | 4157 |
4153 } // namespace dart | 4158 } // namespace dart |
OLD | NEW |