Validate all flush IDs if the unvalidated list gets too long.

gpu/ipc/client/command_buffer_proxy_impl.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/ipc/client/command_buffer_proxy_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 248 matching lines @@
 
   bool put_offset_changed = last_put_offset_ != put_offset;
   last_put_offset_ = put_offset;
   last_barrier_put_offset_ = put_offset;
 
   if (channel_) {
     uint32_t highest_verified_flush_id;
     const uint32_t flush_id = channel_->OrderingBarrier(
         route_id_, stream_id_, put_offset, ++flush_count_, latency_info_,
         put_offset_changed, true, &highest_verified_flush_id);
-    UpdateVerifiedReleases(highest_verified_flush_id);
     if (put_offset_changed) {
       DCHECK(flush_id);
       const uint64_t fence_sync_release = next_fence_sync_release_ - 1;
       if (fence_sync_release > flushed_fence_sync_release_) {
         flushed_fence_sync_release_ = fence_sync_release;
         flushed_release_flush_id_.push(
             std::make_pair(fence_sync_release, flush_id));
       }
+      CleanupFlushedReleases(highest_verified_flush_id);

[piman, 2016/09/07 23:49:10]

nit: any reason to only do that when put_offset_changed is true? The
highest_verified_flush_id can change regardless (e.g other context on the same
stream did a verify).

     }
   }
 
   if (put_offset_changed)
     latency_info_.clear();
 }
 
 void CommandBufferProxyImpl::OrderingBarrier(int32_t put_offset) {
   CheckLock();
   if (last_state_.error != gpu::error::kNoError)
     return;
 
   TRACE_EVENT1("gpu", "CommandBufferProxyImpl::OrderingBarrier", "put_offset",
                put_offset);
 
   bool put_offset_changed = last_barrier_put_offset_ != put_offset;
   last_barrier_put_offset_ = put_offset;
 
   if (channel_) {
     uint32_t highest_verified_flush_id;
     const uint32_t flush_id = channel_->OrderingBarrier(
         route_id_, stream_id_, put_offset, ++flush_count_, latency_info_,
         put_offset_changed, false, &highest_verified_flush_id);
-    UpdateVerifiedReleases(highest_verified_flush_id);
 
     if (put_offset_changed) {
       DCHECK(flush_id);
       const uint64_t fence_sync_release = next_fence_sync_release_ - 1;
       if (fence_sync_release > flushed_fence_sync_release_) {
         flushed_fence_sync_release_ = fence_sync_release;
         flushed_release_flush_id_.push(
             std::make_pair(fence_sync_release, flush_id));
       }
+      CleanupFlushedReleases(highest_verified_flush_id);
     }
   }
 
   if (put_offset_changed)
     latency_info_.clear();
 }
 
 void CommandBufferProxyImpl::SetLatencyInfo(
     const std::vector<ui::LatencyInfo>& latency_info) {
   CheckLock();
@@ skipping 418 matching lines @@
   while (!flushed_release_flush_id_.empty()) {
     const std::pair<uint64_t, uint32_t>& front_item =
         flushed_release_flush_id_.front();
     if (front_item.second > verified_flush)
       break;
     verified_fence_sync_release_ = front_item.first;
     flushed_release_flush_id_.pop();
   }
 }
 
+void CommandBufferProxyImpl::CleanupFlushedReleases(
+    uint32_t highest_verified_flush_id) {
+  DCHECK(channel_);
+  static const uint32_t kMaxUnverifiedFlushes = 1000;
+  if (flushed_release_flush_id_.size() > kMaxUnverifiedFlushes) {
+    // Prevent list of unverified flushes from growing indefinitely.
+    highest_verified_flush_id =
+        channel_->ValidateFlushIDReachedServer(stream_id_, false);
+  }
+  UpdateVerifiedReleases(highest_verified_flush_id);
+}
+
 gpu::CommandBufferSharedState* CommandBufferProxyImpl::shared_state() const {
   return reinterpret_cast<gpu::CommandBufferSharedState*>(
       shared_state_shm_->memory());
 }
 
 void CommandBufferProxyImpl::OnSwapBuffersCompleted(
     const GpuCommandBufferMsg_SwapBuffersCompleted_Params& params) {
 #if defined(OS_MACOSX)
   gpu::GpuProcessHostedCALayerTreeParamsMac params_mac;
   params_mac.surface_handle = params.surface_handle;
@@ skipping 97 matching lines @@
     return;
   channel_->FlushPendingStream(stream_id_);
   channel_->Send(new GpuChannelMsg_DestroyCommandBuffer(route_id_));
   channel_->RemoveRoute(route_id_);
   channel_ = nullptr;
   if (gpu_control_client_)
     gpu_control_client_->OnGpuControlLostContext();
 }
 
 }  // namespace gpu