Shrink QueryTracker when freeing everything

gpu/command_buffer/client/query_tracker.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_QUERY_TRACKER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_QUERY_TRACKER_H_
 
 #include <GLES2/gl2.h>
 
-#include <queue>
+#include <deque>
 #include "../client/hash_tables.h"
 #include "../common/gles2_cmd_format.h"
 #include "gles2_impl_export.h"
 
 namespace gpu {
 
 class CommandBufferHelper;
 class MappedMemoryManager;
 
 namespace gles2 {
 
 class GLES2Implementation;
 
 // Manages buckets of QuerySync instances in mapped memory.
 class GLES2_IMPL_EXPORT QuerySyncManager {
  public:
   static const size_t kSyncsPerBucket = 4096;
 
+  struct Bucket {
+    explicit Bucket(QuerySync* sync_mem)
+        : syncs(sync_mem),
+          used_query_count(0) {
+    }
+    QuerySync* syncs;
+    unsigned used_query_count;
+  };
   struct QueryInfo {
-    QueryInfo(int32 id, uint32 offset, QuerySync* sync_mem)
-        : shm_id(id),
+    QueryInfo(Bucket* bucket, int32 id, uint32 offset, QuerySync* sync_mem)
+        : bucket(bucket),
+          shm_id(id),
           shm_offset(offset),
           sync(sync_mem) {
     }
 
     QueryInfo()
-        : shm_id(0),
+        : bucket(NULL),
+          shm_id(0),
           shm_offset(0),
           sync(NULL) {
     }
 
+    Bucket* bucket;
     int32 shm_id;
     uint32 shm_offset;
     QuerySync* sync;
   };
 
   explicit QuerySyncManager(MappedMemoryManager* manager);
   ~QuerySyncManager();
 
   bool Alloc(QueryInfo* info);
   void Free(const QueryInfo& sync);
+  void Shrink();
 
  private:
   MappedMemoryManager* mapped_memory_;
-  std::queue<QuerySync*> buckets_;
-  std::queue<QueryInfo> free_queries_;
+  std::deque<Bucket*> buckets_;
+  std::deque<QueryInfo> free_queries_;
 
   DISALLOW_COPY_AND_ASSIGN(QuerySyncManager);
 };
 
 // Tracks queries for client side of command buffer.
 class GLES2_IMPL_EXPORT QueryTracker {
  public:
   class GLES2_IMPL_EXPORT Query {
    public:
     enum State {
@@ skipping 69 matching lines @@
     uint64 client_begin_time_us_; // Only used for latency query target.
     uint32 result_;
   };
 
   QueryTracker(MappedMemoryManager* manager);
   ~QueryTracker();
 
   Query* CreateQuery(GLuint id, GLenum target);
   Query* GetQuery(GLuint id);
   void RemoveQuery(GLuint id, bool context_lost);
+  void Shrink();
 
  private:
   typedef gpu::hash_map<GLuint, Query*> QueryMap;
 
   QueryMap queries_;
   QuerySyncManager query_sync_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(QueryTracker);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_QUERY_TRACKER_H_