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 891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
902 jsobj.AddProperty("live_ports", live_ports); | 902 jsobj.AddProperty("live_ports", live_ports); |
903 jsobj.AddProperty("control_ports", control_ports); | 903 jsobj.AddProperty("control_ports", control_ports); |
904 jsobj.AddProperty("paused_on_exit", paused_on_exit); | 904 jsobj.AddProperty("paused_on_exit", paused_on_exit); |
905 jsobj.AddProperty("paused_on_start", pause_on_start); | 905 jsobj.AddProperty("paused_on_start", pause_on_start); |
906 jsobj.AddProperty("pause_on_exit", pause_on_exit); | 906 jsobj.AddProperty("pause_on_exit", pause_on_exit); |
907 const Library& lib = | 907 const Library& lib = |
908 Library::Handle(object_store()->root_library()); | 908 Library::Handle(object_store()->root_library()); |
909 jsobj.AddProperty("rootLib", lib); | 909 jsobj.AddProperty("rootLib", lib); |
910 | 910 |
911 timer_list().PrintTimersToJSONProperty(&jsobj); | 911 timer_list().PrintTimersToJSONProperty(&jsobj); |
| 912 |
| 913 { |
| 914 JSONObject typeargsRef(&jsobj, "canonicalTypeArguments"); |
| 915 typeargsRef.AddProperty("type", "@TypeArgumentsList"); |
| 916 typeargsRef.AddProperty("id", "typearguments"); |
| 917 typeargsRef.AddProperty("name", "canonical type arguments"); |
| 918 } |
912 } | 919 } |
913 | 920 |
914 | 921 |
915 void Isolate::VisitIsolates(IsolateVisitor* visitor) { | 922 void Isolate::VisitIsolates(IsolateVisitor* visitor) { |
916 if (visitor == NULL) { | 923 if (visitor == NULL) { |
917 return; | 924 return; |
918 } | 925 } |
919 MonitorLocker ml(isolates_list_monitor_); | 926 MonitorLocker ml(isolates_list_monitor_); |
920 Isolate* current = isolates_list_head_; | 927 Isolate* current = isolates_list_head_; |
921 while (current) { | 928 while (current) { |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1074 return func.raw(); | 1081 return func.raw(); |
1075 } | 1082 } |
1076 | 1083 |
1077 | 1084 |
1078 void IsolateSpawnState::Cleanup() { | 1085 void IsolateSpawnState::Cleanup() { |
1079 SwitchIsolateScope switch_scope(isolate()); | 1086 SwitchIsolateScope switch_scope(isolate()); |
1080 Dart::ShutdownIsolate(); | 1087 Dart::ShutdownIsolate(); |
1081 } | 1088 } |
1082 | 1089 |
1083 } // namespace dart | 1090 } // namespace dart |
OLD | NEW |