| 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/isolate.h" | 5 #include "vm/isolate.h" |
| 6 | 6 |
| 7 #include "include/dart_api.h" | 7 #include "include/dart_api.h" |
| 8 #include "platform/assert.h" | 8 #include "platform/assert.h" |
| 9 #include "platform/json.h" | 9 #include "platform/json.h" |
| 10 #include "lib/mirrors.h" | 10 #include "lib/mirrors.h" |
| (...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 919 jsobj.AddProperty("livePorts", live_ports); | 919 jsobj.AddProperty("livePorts", live_ports); |
| 920 jsobj.AddProperty("controlPorts", control_ports); | 920 jsobj.AddProperty("controlPorts", control_ports); |
| 921 jsobj.AddProperty("pausedOnStart", pause_on_start); | 921 jsobj.AddProperty("pausedOnStart", pause_on_start); |
| 922 jsobj.AddProperty("pausedOnExit", paused_on_exit); | 922 jsobj.AddProperty("pausedOnExit", paused_on_exit); |
| 923 jsobj.AddProperty("pauseOnExit", pause_on_exit); | 923 jsobj.AddProperty("pauseOnExit", pause_on_exit); |
| 924 const Library& lib = | 924 const Library& lib = |
| 925 Library::Handle(object_store()->root_library()); | 925 Library::Handle(object_store()->root_library()); |
| 926 jsobj.AddProperty("rootLib", lib); | 926 jsobj.AddProperty("rootLib", lib); |
| 927 | 927 |
| 928 timer_list().PrintTimersToJSONProperty(&jsobj); | 928 timer_list().PrintTimersToJSONProperty(&jsobj); |
| 929 | 929 { |
| 930 JSONObject tagCounters(&jsobj, "tagCounters"); |
| 931 vm_tag_counters()->PrintToJSONObject(&tagCounters); |
| 932 } |
| 930 if (object_store()->sticky_error() != Object::null()) { | 933 if (object_store()->sticky_error() != Object::null()) { |
| 931 Error& error = Error::Handle(this, object_store()->sticky_error()); | 934 Error& error = Error::Handle(this, object_store()->sticky_error()); |
| 932 ASSERT(!error.IsNull()); | 935 ASSERT(!error.IsNull()); |
| 933 jsobj.AddProperty("error", error, false); | 936 jsobj.AddProperty("error", error, false); |
| 934 } | 937 } |
| 935 | 938 |
| 936 { | 939 { |
| 937 JSONObject typeargsRef(&jsobj, "canonicalTypeArguments"); | 940 JSONObject typeargsRef(&jsobj, "canonicalTypeArguments"); |
| 938 typeargsRef.AddProperty("type", "@TypeArgumentsList"); | 941 typeargsRef.AddProperty("type", "@TypeArgumentsList"); |
| 939 typeargsRef.AddProperty("id", "typearguments"); | 942 typeargsRef.AddProperty("id", "typearguments"); |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1121 return func.raw(); | 1124 return func.raw(); |
| 1122 } | 1125 } |
| 1123 | 1126 |
| 1124 | 1127 |
| 1125 void IsolateSpawnState::Cleanup() { | 1128 void IsolateSpawnState::Cleanup() { |
| 1126 SwitchIsolateScope switch_scope(isolate()); | 1129 SwitchIsolateScope switch_scope(isolate()); |
| 1127 Dart::ShutdownIsolate(); | 1130 Dart::ShutdownIsolate(); |
| 1128 } | 1131 } |
| 1129 | 1132 |
| 1130 } // namespace dart | 1133 } // namespace dart |
| OLD | NEW |