gpu: Notify callbacks the reason for channel creation failure

content/browser/gpu/browser_gpu_channel_host_factory.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 "content/browser/gpu/browser_gpu_channel_host_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 38 matching lines @@
   gpu::GPUInfo gpu_info() { return gpu_info_; }
 
  private:
   friend class base::RefCountedThreadSafe<EstablishRequest>;
   explicit EstablishRequest(int gpu_client_id,
                             uint64_t gpu_client_tracing_id,
                             int gpu_host_id);
   ~EstablishRequest() {}
   void EstablishOnIO();
   void OnEstablishedOnIO(const IPC::ChannelHandle& channel_handle,
-                         const gpu::GPUInfo& gpu_info);
+                         const gpu::GPUInfo& gpu_info,
+                         GpuProcessHost::EstablishChannelStatus status);
   void FinishOnIO();
   void FinishOnMain();
 
   base::WaitableEvent event_;
   const int gpu_client_id_;
   const uint64_t gpu_client_tracing_id_;
   int gpu_host_id_;
-  bool reused_gpu_process_;
   IPC::ChannelHandle channel_handle_;
   gpu::GPUInfo gpu_info_;
   bool finished_;
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 };
 
 scoped_refptr<BrowserGpuChannelHostFactory::EstablishRequest>
 BrowserGpuChannelHostFactory::EstablishRequest::Create(
     int gpu_client_id,
     uint64_t gpu_client_tracing_id,
@@ skipping 11 matching lines @@
 }
 
 BrowserGpuChannelHostFactory::EstablishRequest::EstablishRequest(
     int gpu_client_id,
     uint64_t gpu_client_tracing_id,
     int gpu_host_id)
     : event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
              base::WaitableEvent::InitialState::NOT_SIGNALED),
       gpu_client_id_(gpu_client_id),
       gpu_client_tracing_id_(gpu_client_tracing_id),
       gpu_host_id_(gpu_host_id),

[piman, 2017/04/06 18:16:39]

I think we don't need this one any more.

[sadrul, 2017/04/07 04:10:53]

Yep. Removed.

-      reused_gpu_process_(false),
       finished_(false),
       main_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
 void BrowserGpuChannelHostFactory::EstablishRequest::EstablishOnIO() {
   // TODO(pkasting): Remove ScopedTracker below once crbug.com/477117 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "477117 "
           "BrowserGpuChannelHostFactory::EstablishRequest::EstablishOnIO"));
-  GpuProcessHost* host = GpuProcessHost::FromID(gpu_host_id_);
+  GpuProcessHost* host =
+      GpuProcessHost::Get(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED);
   if (!host) {
-    host = GpuProcessHost::Get(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED);
-    if (!host) {
-      LOG(ERROR) << "Failed to launch GPU process.";
-      FinishOnIO();
-      return;
-    }
-    gpu_host_id_ = host->host_id();
-    reused_gpu_process_ = false;
-  } else {
-    if (reused_gpu_process_) {
-      // We come here if we retried to establish the channel because of a
-      // failure in ChannelEstablishedOnIO, but we ended up with the same
-      // process ID, meaning the failure was not because of a channel error,
-      // but another reason. So fail now.
-      LOG(ERROR) << "Failed to create channel.";
-      FinishOnIO();
-      return;
-    }
-    reused_gpu_process_ = true;
+    LOG(ERROR) << "Failed to launch GPU process.";
+    FinishOnIO();
+    return;
   }
 
   bool preempts = true;
   bool allow_view_command_buffers = true;
   bool allow_real_time_streams = true;
   host->EstablishGpuChannel(
       gpu_client_id_, gpu_client_tracing_id_, preempts,
       allow_view_command_buffers, allow_real_time_streams,
       base::Bind(
           &BrowserGpuChannelHostFactory::EstablishRequest::OnEstablishedOnIO,
           this));
 }
 
 void BrowserGpuChannelHostFactory::EstablishRequest::OnEstablishedOnIO(
     const IPC::ChannelHandle& channel_handle,
-    const gpu::GPUInfo& gpu_info) {
-  if (!channel_handle.mojo_handle.is_valid() && reused_gpu_process_) {
-    // We failed after re-using the GPU process, but it may have died in the
-    // mean time. Retry to have a chance to create a fresh GPU process.
-    DVLOG(1) << "Failed to create channel on existing GPU process. Trying to "
-                "restart GPU process.";
+    const gpu::GPUInfo& gpu_info,
+    GpuProcessHost::EstablishChannelStatus status) {
+  if (!channel_handle.mojo_handle.is_valid() &&
+      status == GpuProcessHost::EstablishChannelStatus::GPU_HOST_INVALID) {
     EstablishOnIO();
-  } else {
-    channel_handle_ = channel_handle;
-    gpu_info_ = gpu_info;
-    FinishOnIO();
+    return;
   }
+  channel_handle_ = channel_handle;
+  gpu_info_ = gpu_info;
+  FinishOnIO();
 }
 
 void BrowserGpuChannelHostFactory::EstablishRequest::FinishOnIO() {
   event_.Signal();
   main_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&BrowserGpuChannelHostFactory::EstablishRequest::FinishOnMain,
                  this));
 }
 
@@ skipping 197 matching lines @@
 }
 
 // static
 void BrowserGpuChannelHostFactory::InitializeShaderDiskCacheOnIO(
     int gpu_client_id,
     const base::FilePath& cache_dir) {
   GetShaderCacheFactorySingleton()->SetCacheInfo(gpu_client_id, cache_dir);
 }
 
 }  // namespace content