Chromium Code Reviews| Index: runtime/vm/isolate.cc |
| =================================================================== |
| --- runtime/vm/isolate.cc (revision 4295) |
| +++ runtime/vm/isolate.cc (working copy) |
| @@ -67,8 +67,7 @@ |
| void IsolateMessageHandler::MessageNotify(Message::Priority priority) { |
| if (priority >= Message::kOOBPriority) { |
| // Handle out of band messages even if the isolate is busy. |
| - // isolate_->ScheduleInterrupts(Isolate::kMessageInterrupt); |
| - UNIMPLEMENTED(); |
| + isolate_->ScheduleInterrupts(Isolate::kMessageInterrupt); |
| } |
| Dart_MessageNotifyCallback callback = isolate_->message_notify_callback(); |
| if (callback) { |
| @@ -399,24 +398,33 @@ |
| Message* message = message_handler()->queue()->Dequeue(0); |
| if (message != NULL) { |
| - if (message->priority() >= Message::kOOBPriority) { |
| - // TODO(turnidge): Out of band messages will not go through the |
| - // regular message handler. Instead they will be dispatched to |
| - // special vm code. Implement. |
| - UNIMPLEMENTED(); |
| - } |
| const Instance& msg = |
| Instance::Handle(DeserializeMessage(message->data())); |
| - const Object& result = Object::Handle( |
| - DartLibraryCalls::HandleMessage( |
| - message->dest_port(), message->reply_port(), msg)); |
| - delete message; |
| - if (result.IsError()) { |
| - Error& error = Error::Handle(); |
| - error ^= result.raw(); |
| - return error.raw(); |
| + if (message->priority() >= Message::kOOBPriority) { |
| + // For now the only OOB messages are Mirrors messages. |
| + const Object& result = Object::Handle( |
| + DartLibraryCalls::HandleMirrorsMessage( |
| + message->dest_port(), message->reply_port(), msg)); |
| + delete message; |
| + if (result.IsError()) { |
| + // TODO(turnidge): Propagating the error is probably wrong here. |
| + Error& error = Error::Handle(); |
| + error ^= result.raw(); |
| + return error.raw(); |
| + } |
| + ASSERT(result.IsNull()); |
| + } else { |
| + const Object& result = Object::Handle( |
| + DartLibraryCalls::HandleMessage( |
| + message->dest_port(), message->reply_port(), msg)); |
| + delete message; |
| + if (result.IsError()) { |
| + Error& error = Error::Handle(); |
| + error ^= result.raw(); |
| + return error.raw(); |
| + } |
| + ASSERT(result.IsNull()); |
|
siva
2012/02/18 01:25:55
Ditto comment about code being duplicated here.
|
| } |
| - ASSERT(result.IsNull()); |
| } |
| } |