Adding GpuMemoryManager to track GpuCommandBufferStub visibility and last_used_time and dictate mem…

content/common/gpu/gpu_command_buffer_stub.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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/shared_memory.h"
+#include "base/time.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_watchdog.h"
 #include "content/common/gpu/image_transport_surface.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 GpuCommandBufferStub::GpuCommandBufferStub(
     GpuChannel* channel,
     GpuCommandBufferStub* share_group,
     gfx::PluginWindowHandle handle,
     const gfx::Size& size,
     const gpu::gles2::DisallowedFeatures& disallowed_features,
     const std::string& allowed_extensions,
     const std::vector<int32>& attribs,
     gfx::GpuPreference gpu_preference,
     int32 route_id,
     int32 surface_id,
     GpuWatchdog* watchdog,
     bool software)
     : channel_(channel),
       handle_(handle),
       initial_size_(size),
       disallowed_features_(disallowed_features),
       allowed_extensions_(allowed_extensions),
       requested_attribs_(attribs),
       gpu_preference_(gpu_preference),
       route_id_(route_id),
       software_(software),
       last_flush_count_(0),
+      visible_(true),
+      last_used_time_(kUnknownLastUsedTime),
       surface_id_(surface_id),
       parent_stub_for_initialization_(),
       parent_texture_for_initialization_(0),
       watchdog_(watchdog) {
   if (share_group) {
     context_group_ = share_group->context_group_;
   } else {
     // TODO(gman): this needs to be false for everything but Pepper.
     bool bind_generates_resource = true;
     context_group_ = new gpu::gles2::ContextGroup(bind_generates_resource);
@@ skipping 90 matching lines @@
 
   if (decoder_.get()) {
     decoder_->Destroy();
     decoder_.reset();
   }
 
   command_buffer_.reset();
 
   context_ = NULL;
   surface_ = NULL;
+
+  channel_->gpu_channel_manager()->GetGpuMemoryManager()->Manage();
 }
 
 void GpuCommandBufferStub::OnInitializeFailed(IPC::Message* reply_message) {
   Destroy();
   GpuCommandBufferMsg_Initialize::WriteReplyParams(reply_message, false);
   Send(reply_message);
 }
 
 void GpuCommandBufferStub::OnInitialize(
     IPC::Message* reply_message) {
@@ skipping 101 matching lines @@
 
   if (parent_stub_for_initialization_) {
     decoder_->SetParent(parent_stub_for_initialization_->decoder_.get(),
                         parent_texture_for_initialization_);
     parent_stub_for_initialization_.reset();
     parent_texture_for_initialization_ = 0;
   }
 
   GpuCommandBufferMsg_Initialize::WriteReplyParams(reply_message, true);
   Send(reply_message);
+
+  channel_->gpu_channel_manager()->GetGpuMemoryManager()->Manage();
 }
 
 void GpuCommandBufferStub::OnSetGetBuffer(
     int32 shm_id, IPC::Message* reply_message) {
   if (command_buffer_.get()) {
     command_buffer_->SetGetBuffer(shm_id);
   } else {
     DLOG(ERROR) << "no command_buffer.";
     reply_message->set_reply_error();
   }
@@ skipping 70 matching lines @@
   if (flush_count - last_flush_count_ < 0x8000000U) {
     last_flush_count_ = flush_count;
     command_buffer_->Flush(put_offset);
   } else {
     // We received this message out-of-order. This should not happen but is here
     // to catch regressions. Ignore the message.
     NOTREACHED() << "Received a Flush message out-of-order";
   }
 
   ReportState();
+  // TODO(mmocny): Call GpuMemoryManager::Manage here?
 }
 
 void GpuCommandBufferStub::OnRescheduled() {
   gpu::CommandBuffer::State pre_state = command_buffer_->GetLastState();
   command_buffer_->Flush(pre_state.put_offset);
   gpu::CommandBuffer::State post_state = command_buffer_->GetLastState();
 
   if (pre_state.get_offset != post_state.get_offset)
     ReportState();
 }
@@ skipping 112 matching lines @@
                       channel_->renderer_process());
 }
 
 void GpuCommandBufferStub::OnDestroyVideoDecoder(int decoder_route_id) {
   channel_->RemoveRoute(decoder_route_id);
   video_decoders_.Remove(decoder_route_id);
 }
 
 void GpuCommandBufferStub::OnSetSurfaceVisible(bool visible) {
   surface_->SetVisible(visible);
+  visible_ = visible;
+  base::Time now = base::Time::Now();
+  last_used_time_ = now.ToInternalValue();
+
+  channel_->gpu_channel_manager()->GetGpuMemoryManager()->Manage();

[nduca, 2012/01/27 10:10:13]

Not liking this. I would rather you modify the upper level plumbing to hit
manage() after every PutChanged, for instance. Or, add a method on
GpuMemoryManager saying ScheduleManage() that itself contains the logic about
when to manage.

[mmocny, 2012/01/27 19:51:33]

Added ScheduleManage.
On 2012/01/27 10:10:13, nduca wrote:

 }
 
 void GpuCommandBufferStub::SendConsoleMessage(
     int32 id,
     const std::string& message) {
   GPUCommandBufferConsoleMessage console_message;
   console_message.id = id;
   console_message.message = message;
   IPC::Message* msg = new GpuCommandBufferMsg_ConsoleMsg(
       route_id_, console_message);
   msg->set_unblock(true);
   Send(msg);
 }
 
+std::vector<int> GpuCommandBufferStub::render_widget_ids() const {
+  // TODO(mmocny): Hack alert, treat route_id as renderer_widget_id until
+  //               we actually feed real render_widget_ids through
+  return std::vector<int>(1,int(route_id_));

[nduca, 2012/01/27 10:10:13]

woah, what? You can wire this up already if you think about it. When you create
a stub, you set whether it is rendering to a render_view_ --- I think that if
thats nonzero, it should be immediately added to the affected_render_widget_ids_
vector. I made a similar comment about this in the chrome-side extensions patch.

[mmocny, 2012/01/27 19:51:33]

I cannot find any reference to render_view during stub creation.
This return value was used as a temporary placeholder during testing, I will
change it to return a reference to an empty vector.
On 2012/01/27 10:10:13, nduca wrote:

+}

[nduca, 2012/01/27 10:10:13]

Shouldn't you be using render_view_id, not route_id_? Is this why your merge
stuff is wonky?

+
+void GpuCommandBufferStub::SetMemoryAllocation(
+    GpuMemoryAllocation const& allocation) {
+  // TODO(mmocny): 1. Send callback once gl extensions are added
+  //               2. Move drop backbuffer hook from SetSurfaceVisibile to here

[nduca, 2012/01/27 10:10:13]

Woah, this will have side effects other than just sending? I think you should
blow this up into a Send which you should do right away.

2-4 should be a different function call on this class. its fine if the memory
manager makes two calls to this class. Its a huge win to make your functions do
clear and well defined things rather than have 4 side effects.

You'll remove these printfs right?

[mmocny, 2012/01/27 19:51:33]

You are correct on all points, this was leftover debugging stuff that should
have been removed
On 2012/01/27 10:10:13, nduca wrote:

+  //               3. Implement drop frontbuffer with hook here
+  //               4. Implement browser notification on drop frontbuffer
+#if 0
+  printf("   [%p] Allocation: %i, front: %s, back: %s\n", this,
+      allocation.gpuResourceSizeInBytes,
+      allocation.hasFrontbuffer ? "true" : "false",
+      allocation.hasBackbuffer ? "true" : "false");
+#endif
+}
+
 #endif  // defined(ENABLE_GPU)