1. Add isolate id parameter to all the debugger commands in the debugger wire protocol so that the …

runtime/bin/dbg_connection.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
@@ skipping 206 matching lines @@
         delete msg;
         break;
       }
       i++;
     }
     if (!is_handled) {
       // Check if this is an isolate specific command.
       int32_t cmd_idx = DbgMsgQueueList::LookupIsolateCommand(r.ValueChars(),
                                                               r.ValueLen());
       if (cmd_idx != DbgMsgQueueList::kInvalidCommand) {
+        const char* start = msgbuf_->buf();
+        const char* end = r.EndOfObject();
         // Get debug message queue corresponding to isolate.
-        // TODO(asiva): Once we have support for including the isolate id
-        // in the debug wire protocol we need to read the isolate id and
-        // pass it down to AddIsolateMessage.
-        if (!DbgMsgQueueList::AddIsolateMessage(ILLEGAL_ISOLATE_ID,
+        MessageParser msg_parser(start, (end - start));
+        Dart_IsolateId isolate_id =
+            static_cast<Dart_IsolateId>(msg_parser.GetIntParam("isolateId"));
+        if (!DbgMsgQueueList::AddIsolateMessage(isolate_id,
                                                 cmd_idx,
                                                 msgbuf_->buf(),
                                                 r.EndOfObject(),
                                                 debug_fd_)) {
           SendError(debug_fd_, MessageId(), "Invalid isolate specified");
         }
         msgbuf_->PopMessage();
         continue;
       }
 
@@ skipping 178 matching lines @@
   ASSERT(singleton_handler != NULL);
   return singleton_handler;
 }
 
 
 bool DebuggerConnectionHandler::IsConnected() {
   // TODO(asiva): Support multiple debugger connections.
   // Return true if a connection has been established.
   return singleton_handler != NULL;
 }