Wire up resource cache stats dumping in nanobench

src/gpu/GrTest.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTest.h"
 
@@ skipping 87 matching lines @@
     fGpu->stats()->reset();
 #endif
 }
 
 void GrContext::dumpCacheStats(SkString* out) const {
 #if GR_CACHE_STATS
     fResourceCache->dumpStats(out);
 #endif
 }
 
+void GrContext::dumpCacheStatsKeyValuePairs(SkTArray<SkString>* keys,
+                                            SkTArray<double>* values) const {
+#if GR_CACHE_STATS
+    fResourceCache->dumpStatsKeyValuePairs(keys, values);
+#endif
+}
+
 void GrContext::printCacheStats() const {
     SkString out;
     this->dumpCacheStats(&out);
     SkDebugf("%s", out.c_str());
 }
 
 void GrContext::dumpGpuStats(SkString* out) const {
 #if GR_GPU_STATS
     return fGpu->stats()->dump(out);
 #endif
@@ skipping 92 matching lines @@
     out->appendf("\t\tEntry Count: current %d"
                  " (%d budgeted, %d external(%d borrowed, %d adopted), %d locked, %d scratch %.2g%% full), high %d\n",
                  stats.fTotal, fBudgetedCount, stats.fExternal, stats.fBorrowed,
                  stats.fAdopted, stats.fNumNonPurgeable, stats.fScratch, countUtilization,
                  fHighWaterCount);
     out->appendf("\t\tEntry Bytes: current %d (budgeted %d, %.2g%% full, %d unbudgeted) high %d\n",
                  SkToInt(fBytes), SkToInt(fBudgetedBytes), byteUtilization,
                  SkToInt(stats.fUnbudgetedSize), SkToInt(fHighWaterBytes));
 }
 
+void GrResourceCache::dumpStatsKeyValuePairs(SkTArray<SkString>* keys,
+                                             SkTArray<double>* values) const {
+    this->validate();
+
+    Stats stats;
+    this->getStats(&stats);
+

[robertphillips, 2015/12/02 21:02:13]

Would it make sense for all these to have the same prefix: "gpu_cache" ? They
would be easier to find in the perf GUI.

[joshualitt, 2015/12/02 21:28:37]

Acknowledged.

+    keys->push_back(SkString("total_cache_entries")); values->push_back(stats.fTotal);
+    keys->push_back(SkString("external_cache_entries")); values->push_back(stats.fExternal);
+    keys->push_back(SkString("borrowed_cache_entries")); values->push_back(stats.fBorrowed);
+    keys->push_back(SkString("adopted_cache_entries")); values->push_back(stats.fAdopted);

[robertphillips, 2015/12/02 21:02:13]

fNumPurgeable too ?

[joshualitt, 2015/12/02 21:28:37]

Acknowledged.

+    keys->push_back(SkString("non_purgable_cache_entries")); values->push_back(stats.fNumNonPurgeable);
+    keys->push_back(SkString("scratch_cache_entries")); values->push_back(stats.fScratch);
+    keys->push_back(SkString("cache_unbudgeted_size")); values->push_back(stats.fUnbudgetedSize);
+}
+
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void GrResourceCache::changeTimestamp(uint32_t newTimestamp) { fTimestamp = newTimestamp; }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Code for the mock context. It's built on a mock GrGpu class that does nothing.
 ////
 
@@ skipping 111 matching lines @@
     SkASSERT(nullptr == fGpu);
     fGpu = new MockGpu(this, options);
     SkASSERT(fGpu);
     this->initCommon(options);
 
     // We delete these because we want to test the cache starting with zero resources. Also, none of
     // these objects are required for any of tests that use this context. TODO: make stop allocating
     // resources in the buffer pools.
     fDrawingManager->abandon();
 }