| 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 "vm/code_observers.h" | 10 #include "vm/code_observers.h" |
| (...skipping 1591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1602 { | 1602 { |
| 1603 JSONObject tagCounters(&jsobj, "tagCounters"); | 1603 JSONObject tagCounters(&jsobj, "tagCounters"); |
| 1604 vm_tag_counters()->PrintToJSONObject(&tagCounters); | 1604 vm_tag_counters()->PrintToJSONObject(&tagCounters); |
| 1605 } | 1605 } |
| 1606 if (object_store()->sticky_error() != Object::null()) { | 1606 if (object_store()->sticky_error() != Object::null()) { |
| 1607 Error& error = Error::Handle(this, object_store()->sticky_error()); | 1607 Error& error = Error::Handle(this, object_store()->sticky_error()); |
| 1608 ASSERT(!error.IsNull()); | 1608 ASSERT(!error.IsNull()); |
| 1609 jsobj.AddProperty("error", error, false); | 1609 jsobj.AddProperty("error", error, false); |
| 1610 } | 1610 } |
| 1611 | 1611 |
| 1612 { | |
| 1613 JSONObject typeargsRef(&jsobj, "canonicalTypeArguments"); | |
| 1614 typeargsRef.AddProperty("type", "@TypeArgumentsList"); | |
| 1615 typeargsRef.AddProperty("id", "typearguments"); | |
| 1616 typeargsRef.AddProperty("name", "canonical type arguments"); | |
| 1617 } | |
| 1618 bool is_io_enabled = false; | 1612 bool is_io_enabled = false; |
| 1619 { | 1613 { |
| 1620 const GrowableObjectArray& libs = | 1614 const GrowableObjectArray& libs = |
| 1621 GrowableObjectArray::Handle(object_store()->libraries()); | 1615 GrowableObjectArray::Handle(object_store()->libraries()); |
| 1622 intptr_t num_libs = libs.Length(); | 1616 intptr_t num_libs = libs.Length(); |
| 1623 Library& lib = Library::Handle(); | 1617 Library& lib = Library::Handle(); |
| 1624 String& name = String::Handle(); | 1618 String& name = String::Handle(); |
| 1625 | 1619 |
| 1626 JSONArray lib_array(&jsobj, "libraries"); | 1620 JSONArray lib_array(&jsobj, "libraries"); |
| 1627 for (intptr_t i = 0; i < num_libs; i++) { | 1621 for (intptr_t i = 0; i < num_libs; i++) { |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1979 serialized_message_, serialized_message_len_); | 1973 serialized_message_, serialized_message_len_); |
| 1980 } | 1974 } |
| 1981 | 1975 |
| 1982 | 1976 |
| 1983 void IsolateSpawnState::Cleanup() { | 1977 void IsolateSpawnState::Cleanup() { |
| 1984 SwitchIsolateScope switch_scope(I); | 1978 SwitchIsolateScope switch_scope(I); |
| 1985 Dart::ShutdownIsolate(); | 1979 Dart::ShutdownIsolate(); |
| 1986 } | 1980 } |
| 1987 | 1981 |
| 1988 } // namespace dart | 1982 } // namespace dart |
| OLD | NEW |