Open socket for NaCl GDB debug stub in browser process.

chrome/browser/nacl_host/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 "chrome/browser/nacl_host/nacl_process_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 21 matching lines @@
 #include "chrome/common/nacl_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/common/child_process_host.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_switches.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
 #include "net/base/net_util.h"
+#include "net/base/tcp_listen_socket.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 
 #include "ipc/ipc_channel_posix.h"
 #elif defined(OS_WIN)
 #include <windows.h>
 
 #include "base/threading/thread.h"
@@ skipping 574 matching lines @@
 
   ChromeViewHostMsg_LaunchNaCl::WriteReplyParams(
       reply_msg_, handles_for_renderer, channel_handle);
   chrome_render_message_filter_->Send(reply_msg_);
   chrome_render_message_filter_ = NULL;
   reply_msg_ = NULL;
   internal_->sockets_for_renderer.clear();
   return true;
 }
 
+#if defined(OS_POSIX)
+SocketDescriptor NaClProcessHost::GetDebugStubSocketHandle() {
+  SocketDescriptor s = net::TCPListenSocket::CreateAndBind("127.0.0.1", 4014);

[Mark Seaborn, 2012/09/10 15:39:45]

Nit: Can you make 4014 a named constant?  And comment that this is what NaCl
happened to choose for its debug stub TCP port, but that otherwise it's
arbitrary.

[halyavin, 2012/09/11 11:16:12]

Done.

+  if (listen(s, 1)) {
+    LOG(ERROR) << "Failed to listen debug stub socket";

[Mark Seaborn, 2012/09/10 15:39:45]

Missing a preposition.  Maybe "listen() failed on debug stub socket".

[halyavin, 2012/09/11 11:16:12]

Done.

+    return net::TCPListenSocket::kInvalidSocket;
+  }
+  return s;
+}
+#endif
+
 bool NaClProcessHost::StartNaClExecution() {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
 
   nacl::NaClStartParams params;
   params.validation_cache_enabled = nacl_browser->ValidationCacheIsEnabled();
   params.validation_cache_key = nacl_browser->GetValidationCacheKey();
   params.version = chrome::VersionInfo().CreateVersionString();
   params.enable_exception_handling = enable_exception_handling_;
   params.enable_debug_stub = enable_debug_stub_;
   params.enable_ipc_proxy = enable_ipc_proxy_;
 
   base::PlatformFile irt_file = nacl_browser->IrtFile();
   CHECK_NE(irt_file, base::kInvalidPlatformFileValue);
 
   const ChildProcessData& data = process_->GetData();
   for (size_t i = 0; i < internal_->sockets_for_sel_ldr.size(); i++) {
     if (!ShareHandleToSelLdr(data.handle,
                              internal_->sockets_for_sel_ldr[i], true,
                              &params.handles)) {
       return false;
     }
   }
 
   // Send over the IRT file handle.  We don't close our own copy!
   if (!ShareHandleToSelLdr(data.handle, irt_file, false, &params.handles))
     return false;
 
+#if defined(OS_POSIX)
+  if (enable_debug_stub_) {

[Mark Seaborn, 2012/09/10 15:39:45]

Nit: can you put this after the Mac shared memory block, because it's less
essential?

[halyavin, 2012/09/11 11:16:12]

Done.

+    SocketDescriptor server_socket = GetDebugStubSocketHandle();
+    if (server_socket != net::TCPListenSocket::kInvalidSocket) {
+      params.debug_stub_server_socket =
+          nacl::FileDescriptor(server_socket, true);
+    }
+  }
+#endif
+
 #if defined(OS_MACOSX)
   // For dynamic loading support, NaCl requires a file descriptor that
   // was created in /tmp, since those created with shm_open() are not
   // mappable with PROT_EXEC.  Rather than requiring an extra IPC
   // round trip out of the sandbox, we create an FD here.
   base::SharedMemory memory_buffer;
   base::SharedMemoryCreateOptions options;
   options.size = 1;
   options.executable = true;
   if (!memory_buffer.Create(options)) {
@@ skipping 165 matching lines @@
   } else {
     NaClStartDebugExceptionHandlerThread(
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif