Allow multiple NaCl modules to be debugged.

components/nacl/browser/nacl_process_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/nacl/browser/nacl_process_host.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 646 matching lines @@
   if (nacl_host_message_filter_ != NULL && reply_msg_ != NULL) {
     NaClHostMsg_LaunchNaCl::WriteReplyParams(
         reply_msg_, result, error_message);
     nacl_host_message_filter_->Send(reply_msg_);
     nacl_host_message_filter_ = NULL;
     reply_msg_ = NULL;
   }
 }
 
 // TCP port we chose for NaCl debug stub. It can be any other number.
-static const int kDebugStubPort = 4014;
+static const int kInitialDebugStubPort = 4014;
 
 #if defined(OS_POSIX)
 net::SocketDescriptor NaClProcessHost::GetDebugStubSocketHandle() {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
   net::SocketDescriptor s = net::kInvalidSocket;
   // We allocate currently unused TCP port for debug stub tests. The port

[noelallen_use_chromium, 2013/12/20 01:00:28]

Update comment.

We always try to allocate the default port.  If it fails, we then allocate any
port.  And notify the test system if it's running under test
(HasGdbDebutStubPortListener).

[bradn, 2013/12/20 01:25:35]

Done.

   // number is passed to the test via debug stub port listener.
-  if (nacl_browser->HasGdbDebugStubPortListener()) {
-    int port;
+  int port = kInitialDebugStubPort;
+  s = net::TCPListenSocket::CreateAndBind("127.0.0.1", port);
+  if (s == net::kInvalidSocket) {
     s = net::TCPListenSocket::CreateAndBindAnyPort("127.0.0.1", &port);
-    if (s != net::kInvalidSocket) {
+  }
+  if (s != net::kInvalidSocket) {
+    if (nacl_browser->HasGdbDebugStubPortListener()) {
       nacl_browser->FireGdbDebugStubPortOpened(port);
     }
-  } else {
-    s = net::TCPListenSocket::CreateAndBind("127.0.0.1", kDebugStubPort);
   }
+  process_->SetNaClDebugStubPort(port);
   if (s == net::kInvalidSocket) {
     LOG(ERROR) << "failed to open socket for debug stub";

[noelallen_use_chromium, 2013/12/20 01:00:28]

print port number?

[bradn, 2013/12/20 01:25:35]

Done.

     return net::kInvalidSocket;
   }
   if (listen(s, 1)) {
     LOG(ERROR) << "listen() failed on debug stub socket";
     if (IGNORE_EINTR(close(s)) < 0)
       PLOG(ERROR) << "failed to close debug stub socket";
     return net::kInvalidSocket;
   }
   return s;
 }
@@ skipping 322 matching lines @@
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl