Revert of [mojo] Add CreateSharedBuffer method to Broker.

mojo/edk/system/child_broker_host.cc

 // Copyright 2015 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 "mojo/edk/system/child_broker_host.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/platform_shared_buffer.h"
-#include "mojo/edk/embedder/platform_support.h"
 #include "mojo/edk/system/broker_messages.h"
 #include "mojo/edk/system/broker_state.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/platform_handle_dispatcher.h"
 
-#if defined(OS_POSIX)
-#include <fcntl.h>
-#include <sys/uio.h>
-
-#include "mojo/edk/embedder/platform_channel_utils_posix.h"
-#endif
-
 namespace mojo {
 namespace edk {
 
 namespace {
 #if defined(OS_WIN)
 static const int kDefaultReadBufferSize = 256;
 #endif
 }
 
 ChildBrokerHost::ChildBrokerHost(base::ProcessHandle child_process,
                                  ScopedPlatformHandle pipe)
-    : process_id_(base::GetProcId(child_process)),
-      child_channel_(nullptr),
-      num_bytes_read_(0) {
-  // First set up the synchronous pipe.
-  sync_channel_ = std::move(pipe);
-
-  // See comment in ChildBroker::SetChildBrokerHostHandle. Summary is we need
-  // two pipes, so send the second one over the first one.
-  PlatformChannelPair parent_pipe;
-
-  ScopedPlatformHandle parent_async_channel_handle =
-      parent_pipe.PassServerHandle();
-
-  num_bytes_read_ = 0;
-
-// Send over the async pipe.
-#if defined(OS_WIN)
+    : process_id_(base::GetProcId(child_process)), child_channel_(nullptr) {
+  ScopedPlatformHandle parent_async_channel_handle;
+#if defined(OS_POSIX)
+  parent_async_channel_handle = std::move(pipe);
+#else
   DuplicateHandle(GetCurrentProcess(), child_process,
                   GetCurrentProcess(), &child_process,
                   0, FALSE, DUPLICATE_SAME_ACCESS);
   child_process_ = base::Process(child_process);
-
+  sync_channel_ = std::move(pipe);
   memset(&read_context_.overlapped, 0, sizeof(read_context_.overlapped));
   read_context_.handler = this;
   memset(&write_context_.overlapped, 0, sizeof(write_context_.overlapped));
   write_context_.handler = this;
   read_data_.resize(kDefaultReadBufferSize);
+  num_bytes_read_ = 0;
+
+  // See comment in ChildBroker::SetChildBrokerHostHandle. Summary is we need
+  // two pipes on Windows, so send the second one over the first one.
+  PlatformChannelPair parent_pipe;
+  parent_async_channel_handle = parent_pipe.PassServerHandle();
 
   HANDLE duplicated_child_handle =
       DuplicateToChild(parent_pipe.PassClientHandle().release().handle);
   BOOL rv = WriteFile(sync_channel_.get().handle,
                       &duplicated_child_handle, sizeof(duplicated_child_handle),
                       NULL, &write_context_.overlapped);
   DCHECK(rv || GetLastError() == ERROR_IO_PENDING);
-#else
-  // Send just one null byte.
-  struct iovec iov = {const_cast<char*>(""), 1};
-  PlatformHandle child_handle = parent_pipe.PassClientHandle().release();
-  ssize_t result = PlatformChannelSendmsgWithHandles(sync_channel_.get(), &iov,
-                                                     1, &child_handle, 1);
-  CHECK_NE(-1, result);
 #endif
 
   internal::g_io_thread_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&ChildBrokerHost::InitOnIO, base::Unretained(this),
                  base::Passed(&parent_async_channel_handle)));
 }
 
 base::ProcessId ChildBrokerHost::GetProcessId() {
   return process_id_;
@@ skipping 64 matching lines @@
 
   BrokerState::GetInstance()->ChildBrokerHostCreated(this);
 
 #if defined(OS_WIN)
   // Call this after RoutedRawChannel calls its RawChannel::Init because this
   // call could cause us to get notified that the child has gone away and to
   // delete this class and shut down child_channel_ before Init() has run.
   base::MessageLoopForIO::current()->RegisterIOHandler(
       sync_channel_.get().handle, this);
   BeginRead();
-#else
-  base::MessageLoopForIO::current()->WatchFileDescriptor(
-      sync_channel_.get().handle, true, base::MessageLoopForIO::WATCH_READ,
-      &fd_controller_, this);
-  TryReadAndWriteHandles();
 #endif
 }
 
 void ChildBrokerHost::OnReadMessage(
     const MessageInTransit::View& message_view,
     ScopedPlatformHandleVectorPtr platform_handles) {
   DCHECK(internal::g_io_thread_task_runner->RunsTasksOnCurrentThread());
   CHECK(!platform_handles);
   if (message_view.num_bytes() !=
       static_cast<uint32_t>(sizeof(ConnectMessagePipeMessage))) {
@@ skipping 18 matching lines @@
   }
 }
 
 void ChildBrokerHost::OnError(Error error) {
   DCHECK(internal::g_io_thread_task_runner->RunsTasksOnCurrentThread());
   child_channel_->RemoveRoute(kBrokerRouteId);
   child_channel_ = nullptr;
 }
 
 void ChildBrokerHost::ChannelDestructed(RoutedRawChannel* channel) {
-  // We have two pipes to the child process. It's easier to wait
+  // On Windows, we have two pipes to the child process. It's easier to wait
   // until we get the error from the pipe that is used for synchronous I/O.
+#if !defined(OS_WIN)
+  delete this;
+#endif
 }
 
 #if defined(OS_WIN)
 void ChildBrokerHost::BeginRead() {
   BOOL rv = ReadFile(sync_channel_.get().handle,
                      &read_data_[num_bytes_read_],
                      static_cast<int>(read_data_.size() - num_bytes_read_),
                      nullptr, &read_context_.overlapped);
   if (rv || GetLastError() == ERROR_IO_PENDING)
     return;
@@ skipping 21 matching lines @@
     return;
   }
 
   if (context == &write_context_) {
     write_data_.clear();
     return;
   }
 
   num_bytes_read_ += bytes_transferred;
   CHECK_GE(num_bytes_read_, sizeof(uint32_t));
-  BrokerMessage* message = reinterpret_cast<BrokerMessage*>(read_data_.data());
+  BrokerMessage* message = reinterpret_cast<BrokerMessage*>(&read_data_[0]);
   if (num_bytes_read_ < message->size) {
     read_data_.resize(message->size);
     BeginRead();
     return;
   }
 
   // This should never fire because we only get new requests from a child
   // process after it has read all the previous data we wrote.
   if (!write_data_.empty()) {
     NOTREACHED() << "ChildBrokerHost shouldn't have data to write when it gets "
@@ skipping 77 matching lines @@
 }
 
 HANDLE ChildBrokerHost::DuplicateFromChild(HANDLE handle) {
   HANDLE rv = INVALID_HANDLE_VALUE;
   BOOL result = DuplicateHandle(child_process_.Handle(), handle,
                                 base::GetCurrentProcessHandle(), &rv, 0, FALSE,
                                 DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
   DCHECK(result);
   return rv;
 }
-#else
-void ChildBrokerHost::TryReadAndWriteHandles() {
-  // Message sizes are constant on POSIX currently. Further, the child process
-  // only writes one message before it gets a response.
-  read_data_.resize(sizeof(BrokerMessage));
-
-  std::deque<PlatformHandle> dummy;
-  ssize_t bytes_read = PlatformChannelRecvmsg(
-      sync_channel_.get(), &read_data_[num_bytes_read_],
-      static_cast<int>(read_data_.size() - num_bytes_read_), &dummy);
-  DCHECK(dummy.empty());
-
-  // We call TryReadAndWriteHandles when we are first initialized so this could
-  // fail with EAGAIN or EWOULDBLOCK.
-  if (bytes_read == 0 ||
-      (bytes_read == -1 && errno != EAGAIN && errno != EWOULDBLOCK)) {
-    delete this;
-    return;
-  }
-
-  if (bytes_read == -1)
-    return;
-
-  num_bytes_read_ += bytes_read;
-
-  // We don't know how big the message is yet.
-  if (num_bytes_read_ < sizeof(uint32_t))
-    return;
-
-  BrokerMessage* message = reinterpret_cast<BrokerMessage*>(read_data_.data());
-  // Message not fully read yet.
-  if (num_bytes_read_ < message->size) {
-    DCHECK_LE(message->size, sizeof(BrokerMessage));
-    return;
-  }
-
-  // Should only get one message.
-  DCHECK_EQ(num_bytes_read_, message->size);
-
-  PlatformHandle handle;
-  if (message->id == CREATE_SHARED_BUFFER) {
-    scoped_refptr<PlatformSharedBuffer> shared_buffer =
-        internal::g_platform_support->CreateSharedBuffer(
-            message->shared_buffer_size);
-    if (shared_buffer)
-      handle = shared_buffer->PassPlatformHandle().release();
-    else
-      LOG(ERROR) << "ChildBrokerHost failed to create shared buffer of size "
-                 << message->shared_buffer_size;
-  } else {
-    NOTREACHED() << "Unknown command. Stopping reading.";
-    delete this;
-    return;
-  }
-
-  num_bytes_read_ = 0;
-  read_data_.clear();
-
-  // Send just one null byte. Also send back a null platform handle if we
-  // couldn't create the shared buffer.
-  struct iovec iov = {const_cast<char*>(""), 1};
-  ssize_t result = PlatformChannelSendmsgWithHandles(sync_channel_.get(), &iov,
-                                                     1, &handle, 1);
-  if (result == -1) {
-    PLOG(ERROR) << "ChildBrokerHost could not write to peer";
-    delete this;
-  }
-}
-
-void ChildBrokerHost::OnFileCanReadWithoutBlocking(int fd) {
-  DCHECK(internal::g_io_thread_task_runner->RunsTasksOnCurrentThread());
-  if (fd != sync_channel_.get().handle) {
-    NOTREACHED() << "ChildBrokerHost shouldn't get notifications about file "
-                    "descriptors other than sync_channel_'s";
-    delete this;
-    return;
-  }
-
-  TryReadAndWriteHandles();
-}
-
-void ChildBrokerHost::OnFileCanWriteWithoutBlocking(int fd) {}
 #endif
 
 }  // namespace edk
 }  // namespace mojo