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 // TODO(turnidge): Move elsewhere. | |
1612 { | 1613 { |
1613 JSONObject typeargsRef(&jsobj, "canonicalTypeArguments"); | 1614 JSONObject typeargsRef(&jsobj, "canonicalTypeArguments"); |
Cutch
2015/04/02 18:11:41
please remove
turnidge
2015/04/02 18:27:30
Done.
| |
1614 typeargsRef.AddProperty("type", "@TypeArgumentsList"); | 1615 typeargsRef.AddProperty("type", "@TypeArgumentsList"); |
1615 typeargsRef.AddProperty("id", "typearguments"); | 1616 typeargsRef.AddProperty("id", "typearguments"); |
1616 typeargsRef.AddProperty("name", "canonical type arguments"); | 1617 typeargsRef.AddProperty("name", "canonical type arguments"); |
1617 } | 1618 } |
1618 bool is_io_enabled = false; | 1619 bool is_io_enabled = false; |
1619 { | 1620 { |
1620 const GrowableObjectArray& libs = | 1621 const GrowableObjectArray& libs = |
1621 GrowableObjectArray::Handle(object_store()->libraries()); | 1622 GrowableObjectArray::Handle(object_store()->libraries()); |
1622 intptr_t num_libs = libs.Length(); | 1623 intptr_t num_libs = libs.Length(); |
1623 Library& lib = Library::Handle(); | 1624 Library& lib = Library::Handle(); |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1979 serialized_message_, serialized_message_len_); | 1980 serialized_message_, serialized_message_len_); |
1980 } | 1981 } |
1981 | 1982 |
1982 | 1983 |
1983 void IsolateSpawnState::Cleanup() { | 1984 void IsolateSpawnState::Cleanup() { |
1984 SwitchIsolateScope switch_scope(I); | 1985 SwitchIsolateScope switch_scope(I); |
1985 Dart::ShutdownIsolate(); | 1986 Dart::ShutdownIsolate(); |
1986 } | 1987 } |
1987 | 1988 |
1988 } // namespace dart | 1989 } // namespace dart |
OLD | NEW |