SkDiscardableMemoryPool to abstract class

tools/bench_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BenchTimer.h"
 #include "CopyTilesRenderer.h"
 #include "LazyDecodeBitmap.h"
@@ skipping 28 matching lines @@
 DECLARE_int32(multi);
 DECLARE_string(readPath);
 DEFINE_int32(repeat, 1, "Set the number of times to repeat each test.");
 DEFINE_bool(timeIndividualTiles, false, "Report times for drawing individual tiles, rather than "
             "times for drawing the whole page. Requires tiled rendering.");
 DEFINE_bool(purgeDecodedTex, false, "Purge decoded and GPU-uploaded textures "
             "after each iteration.");
 DEFINE_string(timers, "c", "[wcgWC]*: Display wall, cpu, gpu, truncated wall or truncated cpu time"
               " for each picture.");
 DEFINE_bool(trackDeferredCaching, false, "Only meaningful with --deferImageDecoding and "
-            "LAZY_CACHE_STATS set to true. Report percentage of cache hits when using deferred "
-            "image decoding.");
+            "SK_LAZY_CACHE_STATS set to true. Report percentage of cache hits when using "
+            "deferred image decoding.");
 
 static char const * const gFilterTypes[] = {
     "paint",
     "point",
     "line",
     "bitmap",
     "rect",
     "oval",
     "path",
     "text",
@@ skipping 74 matching lines @@
             result += "\n\t\t";
             len = result.size();
         }
         if (index < kFilterFlagsCount - 1) {
             result += " | ";
         }
     }
     return result;
 }
 
-#if LAZY_CACHE_STATS
+#if SK_LAZY_CACHE_STATS
 static int32_t gTotalCacheHits;
 static int32_t gTotalCacheMisses;
 #endif
 
 static bool run_single_benchmark(const SkString& inputPath,
                                  sk_tools::PictureBenchmark& benchmark) {
     SkFILEStream inputStream;
 
     inputStream.setPath(inputPath.c_str());
     if (!inputStream.isValid()) {
@@ skipping 29 matching lines @@
     SkString filename;
     sk_tools::get_basename(&filename, inputPath);
 
     SkString result;
     result.printf("running bench [%i %i] %s ", picture->width(), picture->height(),
                   filename.c_str());
     gLogger.logProgress(result);
 
     benchmark.run(picture);
 
-#if LAZY_CACHE_STATS
+#if SK_LAZY_CACHE_STATS
     if (FLAGS_trackDeferredCaching) {
-        int32_t cacheHits = pool->fCacheHits;
-        int32_t cacheMisses = pool->fCacheMisses;
-        pool->fCacheHits = pool->fCacheMisses = 0;
+        int cacheHits = pool->getCacheHits();
+        int cacheMisses = pool->getCacheMisses();
+        pool->resetCacheHitsAndMisses();
         SkString hitString;
         hitString.printf("Cache hit rate: %f\n", (double) cacheHits / (cacheHits + cacheMisses));
         gLogger.logProgress(hitString);
         gTotalCacheHits += cacheHits;
         gTotalCacheMisses += cacheMisses;
     }
 #endif
     if (FLAGS_countRAM) {
         SkString ramCount("RAM used for bitmaps: ");
         size_t bytes = pool->getRAMUsed();
@@ skipping 218 matching lines @@
     for (int i = 0; i < FLAGS_readPath.count(); ++i) {
         failures += process_input(FLAGS_readPath[i], benchmark);
     }
 
     if (failures != 0) {
         SkString err;
         err.printf("Failed to run %i benchmarks.\n", failures);
         gLogger.logError(err);
         return 1;
     }
-#if LAZY_CACHE_STATS
+#if SK_LAZY_CACHE_STATS
     if (FLAGS_trackDeferredCaching) {
         SkDebugf("Total cache hit rate: %f\n",
                  (double) gTotalCacheHits / (gTotalCacheHits + gTotalCacheMisses));
     }
 #endif
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif