Pepper: Move NaCl fatal logging to Chrome IPC.

components/nacl/loader/nacl_listener.cc

 // Copyright 2013 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/loader/nacl_listener.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 
@@ skipping 99 matching lines @@
     return false;
   return result;
 }
 
 void DebugStubPortSelectedHandler(uint16_t port) {
   g_listener->Send(new NaClProcessHostMsg_DebugStubPortSelected(port));
 }
 
 #endif
 
+void FatalLogHandler(const char* buf, size_t bytes) {
+  NaClTrustedListener::Get()->Send(
+      new NaClProcessHostMsg_FatalLogReceived(std::string(buf, bytes)));
+
+  // Give the IPC task runner 50ms to try to send the fatal log message.
+  NaClTrustedListener::Get()->FlushIpcTaskRunner(
+      base::TimeDelta::FromMilliseconds(50));

[dmichael (off chromium), 2014/07/30 20:18:52]

I think I'd rather see a SendFatalLog method on NaClTrustedListener, with
FlushIpcTaskRunner private. Just to avoid any future users of
NaClTrustedListener thinking they should do this Flush if they send a message.

+}
+
 // Creates the PPAPI IPC channel between the NaCl IRT and the host
 // (browser/renderer) process, and starts to listen it on the thread where
 // the given message_loop_proxy runs.
 // Also, creates and sets the corresponding NaClDesc to the given nap with
 // the FD #.
 void SetUpIPCAdapter(IPC::ChannelHandle* handle,
                      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
                      struct NaClApp* nap,
                      int nacl_fd) {
   scoped_refptr<NaClIPCAdapter> ipc_adapter(
@@ skipping 144 matching lines @@
   int urandom_fd = dup(base::GetUrandomFD());
   if (urandom_fd < 0) {
     LOG(ERROR) << "Failed to dup() the urandom FD";
     return;
   }
   NaClChromeMainSetUrandomFd(urandom_fd);
 #endif
 
   struct NaClApp* nap = NULL;
   NaClChromeMainInit();
+
+  NaClSetFatalErrorCallback(&FatalLogHandler);
+
   nap = NaClAppCreate();
   if (nap == NULL) {
     LOG(ERROR) << "NaClAppCreate() failed";
     return;
   }
 
   IPC::ChannelHandle browser_handle;
   IPC::ChannelHandle ppapi_renderer_handle;
 
   if (params.enable_ipc_proxy) {
@@ skipping 210 matching lines @@
   IPC::ChannelHandle trusted_renderer_handle =
       IPC::Channel::GenerateVerifiedChannelID("nacl");
   trusted_listener_ = new NaClTrustedListener(
       trusted_renderer_handle, io_thread_.message_loop_proxy().get());
 #if defined(OS_POSIX)
   trusted_renderer_handle.socket = base::FileDescriptor(
       trusted_listener_->TakeClientFileDescriptor(), true);
 #endif
   return trusted_renderer_handle;
 }