| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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 "lib/mirrors.h" |
| 9 #include "vm/compiler_stats.h" | 10 #include "vm/compiler_stats.h" |
| 10 #include "vm/dart_api_state.h" | 11 #include "vm/dart_api_state.h" |
| 11 #include "vm/dart_entry.h" | 12 #include "vm/dart_entry.h" |
| 12 #include "vm/debugger.h" | 13 #include "vm/debugger.h" |
| 13 #include "vm/debuginfo.h" | 14 #include "vm/debuginfo.h" |
| 14 #include "vm/heap.h" | 15 #include "vm/heap.h" |
| 15 #include "vm/message_handler.h" | 16 #include "vm/message_handler.h" |
| 16 #include "vm/object_store.h" | 17 #include "vm/object_store.h" |
| 17 #include "vm/parser.h" | 18 #include "vm/parser.h" |
| 18 #include "vm/port.h" | 19 #include "vm/port.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 | 92 |
| 92 bool IsolateMessageHandler::HandleMessage(Message* message) { | 93 bool IsolateMessageHandler::HandleMessage(Message* message) { |
| 93 StartIsolateScope start_scope(isolate_); | 94 StartIsolateScope start_scope(isolate_); |
| 94 Zone zone(isolate_); | 95 Zone zone(isolate_); |
| 95 HandleScope handle_scope(isolate_); | 96 HandleScope handle_scope(isolate_); |
| 96 | 97 |
| 97 const Instance& msg = | 98 const Instance& msg = |
| 98 Instance::Handle(DeserializeMessage(message->data())); | 99 Instance::Handle(DeserializeMessage(message->data())); |
| 99 if (message->IsOOB()) { | 100 if (message->IsOOB()) { |
| 100 // For now the only OOB messages are Mirrors messages. | 101 // For now the only OOB messages are Mirrors messages. |
| 101 const Object& result = Object::Handle( | 102 HandleMirrorsMessage(isolate_, message->reply_port(), msg); |
| 102 DartLibraryCalls::HandleMirrorsMessage( | |
| 103 message->dest_port(), message->reply_port(), msg)); | |
| 104 delete message; | 103 delete message; |
| 105 if (result.IsError()) { | |
| 106 // TODO(turnidge): Propagating the error is probably wrong here. | |
| 107 Error& error = Error::Handle(); | |
| 108 error ^= result.raw(); | |
| 109 isolate_->object_store()->set_sticky_error(error); | |
| 110 return false; | |
| 111 } | |
| 112 ASSERT(result.IsNull()); | |
| 113 } else { | 104 } else { |
| 114 const Object& result = Object::Handle( | 105 const Object& result = Object::Handle( |
| 115 DartLibraryCalls::HandleMessage( | 106 DartLibraryCalls::HandleMessage( |
| 116 message->dest_port(), message->reply_port(), msg)); | 107 message->dest_port(), message->reply_port(), msg)); |
| 117 delete message; | 108 delete message; |
| 118 if (result.IsError()) { | 109 if (result.IsError()) { |
| 119 Error& error = Error::Handle(); | 110 Error& error = Error::Handle(); |
| 120 error ^= result.raw(); | 111 error ^= result.raw(); |
| 121 isolate_->object_store()->set_sticky_error(error); | 112 isolate_->object_store()->set_sticky_error(error); |
| 122 return false; | 113 return false; |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 | 448 |
| 458 | 449 |
| 459 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor, | 450 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor, |
| 460 bool visit_prologue_weak_handles) { | 451 bool visit_prologue_weak_handles) { |
| 461 if (api_state() != NULL) { | 452 if (api_state() != NULL) { |
| 462 api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles); | 453 api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles); |
| 463 } | 454 } |
| 464 } | 455 } |
| 465 | 456 |
| 466 } // namespace dart | 457 } // namespace dart |
| OLD | NEW |