Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: runtime/vm/isolate.cc

Issue 1379163002: Some changes to service protocol before we land 1.13. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: CHANGELOG Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « runtime/observatory/lib/src/service/object.dart ('k') | runtime/vm/service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "include/dart_native_api.h" 8 #include "include/dart_native_api.h"
9 #include "platform/assert.h" 9 #include "platform/assert.h"
10 #include "platform/json.h" 10 #include "platform/json.h"
(...skipping 1794 matching lines...) Expand 10 before | Expand all | Expand 10 after
1805 static_cast<intptr_t>(main_port())); 1805 static_cast<intptr_t>(main_port()));
1806 1806
1807 jsobj.AddProperty("name", debugger_name()); 1807 jsobj.AddProperty("name", debugger_name());
1808 jsobj.AddPropertyF("number", "%" Pd "", 1808 jsobj.AddPropertyF("number", "%" Pd "",
1809 static_cast<intptr_t>(main_port())); 1809 static_cast<intptr_t>(main_port()));
1810 if (ref) { 1810 if (ref) {
1811 return; 1811 return;
1812 } 1812 }
1813 int64_t start_time_millis = start_time() / kMicrosecondsPerMillisecond; 1813 int64_t start_time_millis = start_time() / kMicrosecondsPerMillisecond;
1814 jsobj.AddPropertyTimeMillis("startTime", start_time_millis); 1814 jsobj.AddPropertyTimeMillis("startTime", start_time_millis);
1815 IsolateSpawnState* state = spawn_state();
1816 if (state != NULL) {
1817 const Object& entry = Object::Handle(this, state->ResolveFunction());
1818 if (!entry.IsNull() && entry.IsFunction()) {
1819 Function& func = Function::Handle(this);
1820 func ^= entry.raw();
1821 jsobj.AddProperty("entry", func);
1822 }
1823 }
1824 { 1815 {
1825 JSONObject jsheap(&jsobj, "_heaps"); 1816 JSONObject jsheap(&jsobj, "_heaps");
1826 heap()->PrintToJSONObject(Heap::kNew, &jsheap); 1817 heap()->PrintToJSONObject(Heap::kNew, &jsheap);
1827 heap()->PrintToJSONObject(Heap::kOld, &jsheap); 1818 heap()->PrintToJSONObject(Heap::kOld, &jsheap);
1828 } 1819 }
1829 1820
1830 jsobj.AddProperty("livePorts", message_handler()->live_ports()); 1821 jsobj.AddProperty("livePorts", message_handler()->live_ports());
1831 jsobj.AddProperty("pauseOnExit", message_handler()->pause_on_exit()); 1822 jsobj.AddProperty("pauseOnExit", message_handler()->pause_on_exit());
1832 1823
1833 if (message_handler()->paused_on_start()) { 1824 if (message_handler()->paused_on_start()) {
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
2567 serialized_message_, serialized_message_len_); 2558 serialized_message_, serialized_message_len_);
2568 } 2559 }
2569 2560
2570 2561
2571 void IsolateSpawnState::Cleanup() { 2562 void IsolateSpawnState::Cleanup() {
2572 SwitchIsolateScope switch_scope(I); 2563 SwitchIsolateScope switch_scope(I);
2573 Dart::ShutdownIsolate(); 2564 Dart::ShutdownIsolate();
2574 } 2565 }
2575 2566
2576 } // namespace dart 2567 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/observatory/lib/src/service/object.dart ('k') | runtime/vm/service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698