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 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1629 for (intptr_t i = 0; i < num_libs; i++) { | 1629 for (intptr_t i = 0; i < num_libs; i++) { |
1630 lib ^= libs.At(i); | 1630 lib ^= libs.At(i); |
1631 ASSERT(!lib.IsNull()); | 1631 ASSERT(!lib.IsNull()); |
1632 lib_array.AddValue(lib); | 1632 lib_array.AddValue(lib); |
1633 } | 1633 } |
1634 } | 1634 } |
1635 { | 1635 { |
1636 JSONArray breakpoints(&jsobj, "breakpoints"); | 1636 JSONArray breakpoints(&jsobj, "breakpoints"); |
1637 debugger()->PrintBreakpointsToJSONArray(&breakpoints); | 1637 debugger()->PrintBreakpointsToJSONArray(&breakpoints); |
1638 } | 1638 } |
| 1639 |
| 1640 { |
| 1641 JSONObject jssettings(&jsobj, "_debuggerSettings"); |
| 1642 debugger()->PrintSettingsToJSONObject(&jssettings); |
| 1643 } |
1639 } | 1644 } |
1640 | 1645 |
1641 | 1646 |
1642 intptr_t Isolate::ProfileInterrupt() { | 1647 intptr_t Isolate::ProfileInterrupt() { |
1643 // Other threads might be modifying these fields. Save them in locals so that | 1648 // Other threads might be modifying these fields. Save them in locals so that |
1644 // we can at least trust the NULL check. | 1649 // we can at least trust the NULL check. |
1645 IsolateProfilerData* prof_data = profiler_data(); | 1650 IsolateProfilerData* prof_data = profiler_data(); |
1646 if (prof_data == NULL) { | 1651 if (prof_data == NULL) { |
1647 // Profiler not setup for isolate. | 1652 // Profiler not setup for isolate. |
1648 return 0; | 1653 return 0; |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2026 serialized_message_, serialized_message_len_); | 2031 serialized_message_, serialized_message_len_); |
2027 } | 2032 } |
2028 | 2033 |
2029 | 2034 |
2030 void IsolateSpawnState::Cleanup() { | 2035 void IsolateSpawnState::Cleanup() { |
2031 SwitchIsolateScope switch_scope(I); | 2036 SwitchIsolateScope switch_scope(I); |
2032 Dart::ShutdownIsolate(); | 2037 Dart::ShutdownIsolate(); |
2033 } | 2038 } |
2034 | 2039 |
2035 } // namespace dart | 2040 } // namespace dart |
OLD | NEW |