WIP HW

components/mus/common/gpu_service.cc

 // Copyright 2016 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/mus/common/gpu_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/mus/common/gpu_type_converters.h"
-#include "components/mus/common/mojo_gpu_memory_buffer_manager.h"
 #include "components/mus/common/switches.h"
-#include "components/mus/public/interfaces/gpu_service.mojom.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "services/shell/public/cpp/connector.h"
 
 namespace mus {
 
 GpuService::GpuService()
     : main_message_loop_(base::MessageLoop::current()),
       shutdown_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
       io_thread_("GPUIOThread"),
-      gpu_memory_buffer_manager_(new MojoGpuMemoryBufferManager) {
+      gpu_memory_buffer_manager_(new MojoGpuMemoryBufferManager),
+      is_establishing_(false),
+      establishing_condition_(&lock_) {
   base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
   thread_options.priority = base::ThreadPriority::NORMAL;
   CHECK(io_thread_.StartWithOptions(thread_options));
 }
 
 GpuService::~GpuService() {}
 
 // static
 bool GpuService::UseChromeGpuCommandBuffer() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseChromeGpuCommandBufferInMus);
 }
 
 // static
 GpuService* GpuService::GetInstance() {
   return base::Singleton<GpuService,
                          base::LeakySingletonTraits<GpuService>>::get();
 }
 
-scoped_refptr<gpu::GpuChannelHost> GpuService::EstablishGpuChannel(
-    shell::Connector* connector) {
+void GpuService::EstablishGpuChannel(shell::Connector* connector,
+                                     const base::Closure& callback) {
   base::AutoLock auto_lock(lock_);
-  if (gpu_channel_ && gpu_channel_->IsLost()) {
-    gpu_channel_->DestroyChannel();
-    gpu_channel_ = nullptr;
+  auto task_runner = base::ThreadTaskRunnerHandle::Get();
+  DCHECK(task_runner);
+
+  if (GetGpuChannelLocked()) {
+    DCHECK(establish_callbacks_.empty());
+    DCHECK(!is_establishing_);
+    task_runner->PostTask(FROM_HERE, callback);
+    return;
   }
 
-  if (gpu_channel_)
+  establish_callbacks_.push_back(std::make_pair(task_runner, callback));
+  if (!is_establishing_) {
+    is_establishing_ = true;
+    mus::mojom::GpuServicePtr gpu_service;
+    connector->ConnectToInterface("mojo:mus", &gpu_service);
+    const bool locked = false;
+    gpu_service->EstablishGpuChannel(base::Bind(
+        &GpuService::EstablishGpuChannelDone, base::Unretained(this), locked));
+  }
+}
+
+scoped_refptr<gpu::GpuChannelHost> GpuService::EstablishGpuChannelSync(
+    shell::Connector* connector) {
+  fprintf(stderr, "EEE %d %s %d\n", getpid(), __PRETTY_FUNCTION__, __LINE__);
+  base::AutoLock auto_lock(lock_);
+  if (GetGpuChannelLocked())
     return gpu_channel_;
 
-  mus::mojom::GpuServicePtr gpu_service;
-  connector->ConnectToInterface("mojo:mus", &gpu_service);
+  if (is_establishing_) {
+    do {
+      establishing_condition_.Wait();
+    } while (is_establishing_);
+    fprintf(stderr, "EEE %d %s %d\n", getpid(), __PRETTY_FUNCTION__, __LINE__);
+    return gpu_channel_;
+  }
+
+  is_establishing_ = true;
 
   int client_id = 0;
   mojom::ChannelHandlePtr channel_handle;
   mojom::GpuInfoPtr gpu_info;
+  mus::mojom::GpuServicePtr gpu_service;
+  connector->ConnectToInterface("mojo:mus", &gpu_service);
+
   {
+    // Unlock the |lock_| during the sync mojo method call.
+    base::AutoUnlock auto_unlock(lock_);
     // TODO(penghuang): Remove the ScopedAllowWait when HW rendering is enabled
     // in mus chrome.
     base::ThreadRestrictions::ScopedAllowWait allow_wait;
     if (!gpu_service->EstablishGpuChannel(&client_id, &channel_handle,
                                           &gpu_info)) {
       DLOG(WARNING)
           << "Channel encountered error while establishing gpu channel.";
-      return nullptr;
     }
   }
 
-  // TODO(penghuang): Get the real gpu info from mus.
-  gpu_channel_ = gpu::GpuChannelHost::Create(
-      this, client_id, gpu::GPUInfo(), channel_handle.To<IPC::ChannelHandle>(),
-      &shutdown_event_, gpu_memory_buffer_manager_.get());
+  const bool locked = true;
+  EstablishGpuChannelDone(locked, client_id, std::move(channel_handle),
+                          std::move(gpu_info));
+  fprintf(stderr, "EEE %d %s %d\n", getpid(), __PRETTY_FUNCTION__, __LINE__);
   return gpu_channel_;
 }
 
+scoped_refptr<gpu::GpuChannelHost> GpuService::GetGpuChannel() {
+  base::AutoLock auto_lock(lock_);
+  return GetGpuChannelLocked();
+}
+
+scoped_refptr<gpu::GpuChannelHost> GpuService::GetGpuChannelLocked() {
+  if (gpu_channel_ && gpu_channel_->IsLost()) {
+    gpu_channel_->DestroyChannel();
+    gpu_channel_ = nullptr;
+  }
+  return gpu_channel_;
+}
+
+void GpuService::EstablishGpuChannelDone(bool locked,
+                                         int client_id,
+                                         mojom::ChannelHandlePtr channel_handle,
+                                         mojom::GpuInfoPtr gpu_info) {
+  scoped_refptr<gpu::GpuChannelHost> gpu_channel;
+  if (client_id) {
+    // TODO(penghuang): Get the real gpu info from mus.
+    gpu_channel = gpu::GpuChannelHost::Create(
+        this, client_id, gpu::GPUInfo(),
+        channel_handle.To<IPC::ChannelHandle>(), &shutdown_event_,
+        gpu_memory_buffer_manager_.get());
+  }
+
+  std::unique_ptr<base::AutoLock> auto_lock;
+  if (!locked)
+    auto_lock = base::MakeUnique<base::AutoLock>(lock_);
+
+  DCHECK(is_establishing_);
+  DCHECK(!gpu_channel_);
+
+  is_establishing_ = false;
+  gpu_channel_ = gpu_channel;
+  establishing_condition_.Broadcast();
+
+  for (const auto& i : establish_callbacks_)
+    i.first->PostTask(FROM_HERE, i.second);
+  establish_callbacks_.clear();
+}
+
 bool GpuService::IsMainThread() {
   return base::MessageLoop::current() == main_message_loop_;
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 GpuService::GetIOThreadTaskRunner() {
   return io_thread_.task_runner();
 }
 
 std::unique_ptr<base::SharedMemory> GpuService::AllocateSharedMemory(
     size_t size) {
   mojo::ScopedSharedBufferHandle handle =
       mojo::SharedBufferHandle::Create(size);
   if (!handle.is_valid())
     return nullptr;
 
   base::SharedMemoryHandle platform_handle;
   size_t shared_memory_size;
   bool readonly;
   MojoResult result = mojo::UnwrapSharedMemoryHandle(
       std::move(handle), &platform_handle, &shared_memory_size, &readonly);
   if (result != MOJO_RESULT_OK)
     return nullptr;
   DCHECK_EQ(shared_memory_size, size);
 
   return base::MakeUnique<base::SharedMemory>(platform_handle, readonly);
 }
 
 }  // namespace mus