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

Unified Diff: runtime/vm/isolate.cc

Issue 204003002: Support wedging isolates before startup or before exit. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index a2f10ac7b3dc258b8eb58b17bd6cfea3573db904..fa7b1365af4074de831f71ff77d457009125c399 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -299,7 +299,6 @@ Isolate::Isolate()
message_notify_callback_(NULL),
name_(NULL),
start_time_(OS::GetCurrentTimeMicros()),
- pin_port_(0),
main_port_(0),
heap_(NULL),
object_store_(NULL),
@@ -437,7 +436,8 @@ Isolate* Isolate::Init(const char* name_prefix) {
result->set_main_port(PortMap::CreatePort(result->message_handler()));
result->BuildName(name_prefix);
if (FLAG_pin_isolates) {
- result->CreatePinPort();
+ // TODO(johnmccutchan): Add flag to control wedge_on_start.
+ result->message_handler()->set_wedge_on_exit(true);
turnidge 2014/03/18 21:45:37 How about: --pause_Isolates_on_start --pause_isol
Cutch 2014/03/18 23:32:33 Done.
}
result->debugger_ = new Debugger();
@@ -454,28 +454,6 @@ Isolate* Isolate::Init(const char* name_prefix) {
}
-void Isolate::CreatePinPort() {
- ASSERT(FLAG_pin_isolates);
- // Only do this once.
- ASSERT(pin_port_ == 0);
- pin_port_ = PortMap::CreatePort(message_handler());
- ASSERT(pin_port_ != 0);
- PortMap::SetLive(pin_port_);
-}
-
-
-void Isolate::ClosePinPort() {
- if (pin_port_ == 0) {
- // Support multiple calls to close.
- return;
- }
- ASSERT(pin_port_ != 0);
- bool r = PortMap::ClosePort(pin_port_);
- ASSERT(r);
- pin_port_ = 0;
-}
-
-
void Isolate::BuildName(const char* name_prefix) {
ASSERT(name_ == NULL);
if (name_prefix == NULL) {
@@ -916,7 +894,16 @@ void Isolate::PrintToJSONStream(JSONStream* stream) {
// inlined frames.
jsobj.AddProperty("depth", (intptr_t)0);
}
-
+ intptr_t live_ports = message_handler()->live_ports();
+ intptr_t control_ports = message_handler()->control_ports();
+ bool wedged_on_exit = message_handler()->wedged_on_exit();
+ bool wedge_on_start = message_handler()->wedge_on_start();
+ bool wedge_on_exit = message_handler()->wedge_on_exit();
+ jsobj.AddProperty("live_ports", live_ports);
+ jsobj.AddProperty("control_ports", control_ports);
+ jsobj.AddProperty("wedged_on_exit", wedged_on_exit);
+ jsobj.AddProperty("wedged_on_start", wedge_on_start);
+ jsobj.AddProperty("wedge_on_exit", wedge_on_exit);
const Library& lib =
Library::Handle(object_store()->root_library());
jsobj.AddProperty("rootLib", lib);
« no previous file with comments | « runtime/vm/isolate.h ('k') | runtime/vm/message_handler.h » ('j') | runtime/vm/service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698