OLD | NEW |
---|---|
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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/thread.h" | 5 #include "vm/thread.h" |
6 | 6 |
7 #include "vm/compiler_stats.h" | 7 #include "vm/compiler_stats.h" |
8 #include "vm/dart_api_state.h" | 8 #include "vm/dart_api_state.h" |
9 #include "vm/growable_array.h" | 9 #include "vm/growable_array.h" |
10 #include "vm/isolate.h" | 10 #include "vm/isolate.h" |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
204 REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_ALLOCATION) | 204 REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_ALLOCATION) |
205 #undef REUSABLE_HANDLE_ALLOCATION | 205 #undef REUSABLE_HANDLE_ALLOCATION |
206 } | 206 } |
207 | 207 |
208 | 208 |
209 #ifndef PRODUCT | 209 #ifndef PRODUCT |
210 // Collect information about each individual zone associated with this thread. | 210 // Collect information about each individual zone associated with this thread. |
211 void Thread::PrintJSON(JSONStream* stream) const { | 211 void Thread::PrintJSON(JSONStream* stream) const { |
212 JSONObject jsobj(stream); | 212 JSONObject jsobj(stream); |
213 jsobj.AddProperty("type", "_Thread"); | 213 jsobj.AddProperty("type", "_Thread"); |
214 jsobj.AddPropertyF("id", "threads/%" Pd64 "", os_thread()->trace_id()); | 214 jsobj.AddPropertyF("id", "threads/%" Pd64 "", |
215 ThreadIdToIntPtr(os_thread()->trace_id())); | |
zra
2016/12/12 18:20:53
Sorry, I should have noticed that it looks like th
| |
215 Zone* zone = zone_; | 216 Zone* zone = zone_; |
216 { | 217 { |
217 JSONArray zone_info_array(&jsobj, "zones"); | 218 JSONArray zone_info_array(&jsobj, "zones"); |
218 zone = zone_; | 219 zone = zone_; |
219 while (zone != NULL) { | 220 while (zone != NULL) { |
220 zone_info_array.AddValue(zone); | 221 zone_info_array.AddValue(zone); |
221 zone = zone->previous(); | 222 zone = zone->previous(); |
222 } | 223 } |
223 } | 224 } |
224 } | 225 } |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
793 | 794 |
794 DisableThreadInterruptsScope::~DisableThreadInterruptsScope() { | 795 DisableThreadInterruptsScope::~DisableThreadInterruptsScope() { |
795 if (thread() != NULL) { | 796 if (thread() != NULL) { |
796 OSThread* os_thread = thread()->os_thread(); | 797 OSThread* os_thread = thread()->os_thread(); |
797 ASSERT(os_thread != NULL); | 798 ASSERT(os_thread != NULL); |
798 os_thread->EnableThreadInterrupts(); | 799 os_thread->EnableThreadInterrupts(); |
799 } | 800 } |
800 } | 801 } |
801 | 802 |
802 } // namespace dart | 803 } // namespace dart |
OLD | NEW |