Ping watchdog thread during GpuChannel destruction

gpu/command_buffer/service/context_group.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 "gpu/command_buffer/service/context_group.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/path_manager.h"
 #include "gpu/command_buffer/service/program_manager.h"
+#include "gpu/command_buffer/service/progress_reporter.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/sampler_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_version_info.h"
 
 namespace gpu {
 namespace gles2 {
@@ skipping 27 matching lines @@
 
 ContextGroup::ContextGroup(
     const GpuPreferences& gpu_preferences,
     const scoped_refptr<MailboxManager>& mailbox_manager,
     const scoped_refptr<MemoryTracker>& memory_tracker,
     const scoped_refptr<ShaderTranslatorCache>& shader_translator_cache,
     const scoped_refptr<FramebufferCompletenessCache>&
         framebuffer_completeness_cache,
     const scoped_refptr<FeatureInfo>& feature_info,
     bool bind_generates_resource,
-    gpu::ImageFactory* image_factory)
+    gpu::ImageFactory* image_factory,
+    std::unique_ptr<ProgressReporter> progress_reporter)
     : gpu_preferences_(gpu_preferences),
       mailbox_manager_(mailbox_manager),
       memory_tracker_(memory_tracker),
       shader_translator_cache_(shader_translator_cache),
 #if defined(OS_MACOSX)
       // Framebuffer completeness is not cacheable on OS X because of dynamic
       // graphics switching.
       // http://crbug.com/180876
       // TODO(tobiasjs): determine whether GPU switching is possible
       // programmatically, rather than just hardcoding this behaviour
@@ skipping 17 matching lines @@
       max_vertex_output_components_(0u),
       max_fragment_input_components_(0u),
       min_program_texel_offset_(0),
       max_program_texel_offset_(0),
       max_transform_feedback_separate_attribs_(0u),
       max_uniform_buffer_bindings_(0u),
       uniform_buffer_offset_alignment_(1u),
       program_cache_(NULL),
       feature_info_(feature_info),
       image_factory_(image_factory),
+      progress_reporter_(std::move(progress_reporter)),
       passthrough_resources_(new PassthroughResources) {
   {
     DCHECK(feature_info_);
     if (!mailbox_manager_.get())
       mailbox_manager_ = new MailboxManagerImpl;
     transfer_buffer_manager_ = new TransferBufferManager(memory_tracker_.get());
   }
 }
 
 bool ContextGroup::Initialize(GLES2Decoder* decoder,
@@ skipping 358 matching lines @@
 };
 
 }  // namespace anonymous
 
 bool ContextGroup::HaveContexts() {
   decoders_.erase(std::remove_if(decoders_.begin(), decoders_.end(), IsNull),
                   decoders_.end());
   return !decoders_.empty();
 }
 
+void ContextGroup::ReportProgress() {
+  if (progress_reporter_)

[danakj, 2016/10/05 01:53:48]

When is it null? This looks like "null in tests" which is my bane. Can you make
a StubProgressReporter and use that in tests?

[ericrk, 2016/10/05 18:07:31]

Yeah, makes sense. It's actually null in one other case (in proc command
buffer), but that seems fine to use a stub for as well.

+    progress_reporter_->ReportProgress();
+}
+
 void ContextGroup::Destroy(GLES2Decoder* decoder, bool have_context) {
   decoders_.erase(std::remove_if(decoders_.begin(), decoders_.end(),
                                  WeakPtrEquals<gles2::GLES2Decoder>(decoder)),
                   decoders_.end());
   // If we still have contexts do nothing.
   if (HaveContexts()) {
     return;
   }
 
   if (buffer_manager_ != nullptr) {
     if (!have_context) {
       buffer_manager_->MarkContextLost();
     }
     buffer_manager_->Destroy();
     buffer_manager_.reset();
+    ReportProgress();
   }
 
   if (framebuffer_manager_ != NULL) {
     framebuffer_manager_->Destroy(have_context);
     if (texture_manager_)
       texture_manager_->set_framebuffer_manager(NULL);
     framebuffer_manager_.reset();
+    ReportProgress();
   }
 
   if (renderbuffer_manager_ != NULL) {
     renderbuffer_manager_->Destroy(have_context);
     renderbuffer_manager_.reset();
+    ReportProgress();
   }
 
   if (texture_manager_ != NULL) {
-    texture_manager_->Destroy(have_context);
+    texture_manager_->Destroy(have_context, progress_reporter_.get());
     texture_manager_.reset();
+    ReportProgress();
   }
 
   if (path_manager_ != NULL) {
     path_manager_->Destroy(have_context);
     path_manager_.reset();
+    ReportProgress();
   }
 
   if (program_manager_ != NULL) {
-    program_manager_->Destroy(have_context);
+    program_manager_->Destroy(have_context, progress_reporter_.get());
     program_manager_.reset();
+    ReportProgress();
   }
 
   if (shader_manager_ != NULL) {
-    shader_manager_->Destroy(have_context);
+    shader_manager_->Destroy(have_context, progress_reporter_.get());
     shader_manager_.reset();
+    ReportProgress();
   }
 
   if (sampler_manager_ != NULL) {
     sampler_manager_->Destroy(have_context);
     sampler_manager_.reset();
+    ReportProgress();
   }
 
   memory_tracker_ = NULL;
 
   passthrough_resources_->Destroy(have_context);
   passthrough_resources_.reset();
+  ReportProgress();
 }
 
 uint32_t ContextGroup::GetMemRepresented() const {
   uint32_t total = 0;
   if (buffer_manager_.get())
     total += buffer_manager_->mem_represented();
   if (renderbuffer_manager_.get())
     total += renderbuffer_manager_->mem_represented();
   if (texture_manager_.get())
     total += texture_manager_->mem_represented();
@@ skipping 55 matching lines @@
     GLuint client_id, GLuint* service_id) const {
   Buffer* buffer = buffer_manager_->GetBuffer(client_id);
   if (!buffer)
     return false;
   *service_id = buffer->service_id();
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu