Add an IPC channel between the NaCl loader process and the renderer.

chrome/nacl/nacl_listener.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/nacl/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/common/nacl_messages.h"
 #include "chrome/nacl/nacl_validation_db.h"
 #include "chrome/nacl/nacl_validation_query.h"
+#include "ipc/ipc_channel_handle.h"
+#include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
-#include "ipc/ipc_switches.h"
 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
 
 #if defined(OS_LINUX)
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 
@@ skipping 136 matching lines @@
 
 bool NaClListener::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NaClListener, msg)
       IPC_MESSAGE_HANDLER(NaClProcessMsg_Start, OnMsgStart)
       IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+class MyListener : public IPC::Channel::Listener
+{
+  virtual bool OnMessageReceived(const IPC::Message& message) {
+    return true;
+  }
+
+  virtual void OnChannelConnected(int32 peer_pid) {
+  }
+
+  virtual void OnChannelError() {
+  }
+};
+
+class MyFilter : public IPC::ChannelProxy::MessageFilter
+{
+  virtual bool OnMessageReceived(const IPC::Message& message) {
+    return true;
+  }
+};
+
+static MyListener test_listener;

[dmichael (off chromium), 2012/05/04 22:51:42]

Does it make sense for this to be a file-scope static? Can't it just be a member
of NaClListener?

(In any case, it definitely has to change...  we don't allow static initializers
because too many of them will kill startup speed.)

[bbudge, 2012/05/07 18:08:53]

This is just experimental hacking to verify that the channel is working.
Removed.
On 2012/05/04 22:51:42, dmichael wrote:

+
 void NaClListener::OnMsgStart(const nacl::NaClStartParams& params) {
   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
   if (args == NULL) {
     LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
     return;
   }
 
+  // Create the server side of the channel and notify the process host so it
+  // can reply to the renderer, which will then try to connect as client.
+  IPC::ChannelHandle channel_handle =
+      IPC::Channel::GenerateVerifiedChannelID("nacl");
+  ppapi_channel_.reset(
+      new IPC::SyncChannel(&test_listener, io_thread_.message_loop_proxy(),
+                           &shutdown_event_));
+  ppapi_channel_->AddFilter(new MyFilter);
+  ppapi_channel_->Init(channel_handle, IPC::Channel::MODE_SERVER, true);
+
+  Send(new NaClProcessHostMsg_PpapiChannelCreated(channel_handle));
+
   std::vector<nacl::FileDescriptor> handles = params.handles;
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   args->create_memory_object_func = CreateMemoryObject;
 # if defined(OS_MACOSX)
   CHECK(handles.size() >= 1);
   g_shm_fd = nacl::ToNativeHandle(handles[handles.size() - 1]);
   handles.pop_back();
 # endif
 #endif
@@ skipping 24 matching lines @@
   CHECK(handles.size() == 1);
   args->imc_bootstrap_handle = nacl::ToNativeHandle(handles[0]);
   args->enable_exception_handling = params.enable_exception_handling;
   args->enable_debug_stub = debug_enabled_;
 #if defined(OS_WIN)
   args->broker_duplicate_handle_func = BrokerDuplicateHandle;
 #endif
   NaClChromeMainStart(args);
   NOTREACHED();
 }