Correct accounting for wrapped resources

src/gpu/GrResourceCache2.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrResourceCache2.h"
@@ skipping 48 matching lines @@
 
 static const int kDefaultMaxCount = 2 * (1 << 10);
 static const size_t kDefaultMaxSize = 96 * (1 << 20);
 
 GrResourceCache2::GrResourceCache2()
     : fMaxCount(kDefaultMaxCount)
     , fMaxBytes(kDefaultMaxSize)
 #if GR_CACHE_STATS
     , fHighWaterCount(0)
     , fHighWaterBytes(0)
+    , fBudgetedHighWaterCount(0)
+    , fBudgetedHighWaterBytes(0)
 #endif
     , fCount(0)
     , fBytes(0)
+    , fBudgetedCount(0)
+    , fBudgetedBytes(0)
     , fPurging(false)
     , fNewlyPurgableResourceWhilePurging(false)
     , fOverBudgetCB(NULL)
     , fOverBudgetData(NULL) {
 }
 
 GrResourceCache2::~GrResourceCache2() {
     this->releaseAll();
 }
 
 void GrResourceCache2::setLimits(int count, size_t bytes) {
     fMaxCount = count;
     fMaxBytes = bytes;
     this->purgeAsNeeded();
 }
 
 void GrResourceCache2::insertResource(GrGpuResource* resource) {
     AutoValidate av(this);
 
     SkASSERT(resource);
     SkASSERT(!resource->wasDestroyed());
     SkASSERT(!this->isInCache(resource));
     SkASSERT(!fPurging);
     fResources.addToHead(resource);
 
+    size_t size = resource->gpuMemorySize();
     ++fCount;
     fBytes += resource->gpuMemorySize();
 #if GR_CACHE_STATS
     fHighWaterCount = SkTMax(fCount, fHighWaterCount);
     fHighWaterBytes = SkTMax(fBytes, fHighWaterBytes);
 #endif
+    if (!resource->cacheAccess().isWrapped()) {
+        ++fBudgetedCount;
+        fBudgetedBytes += size;
+#if GR_CACHE_STATS
+        fBudgetedHighWaterCount = SkTMax(fBudgetedCount, fBudgetedHighWaterCount);
+        fBudgetedHighWaterBytes = SkTMax(fBudgetedBytes, fBudgetedHighWaterBytes);
+#endif
+    }
     if (!resource->cacheAccess().getScratchKey().isNullScratch()) {
         // TODO(bsalomon): Make this assertion possible.
         // SkASSERT(!resource->isWrapped());
         fScratchMap.insert(resource->cacheAccess().getScratchKey(), resource);
     }
     
     this->purgeAsNeeded();
 }
 
 void GrResourceCache2::removeResource(GrGpuResource* resource) {
     AutoValidate av(this);
 
+    SkASSERT(this->isInCache(resource));
+
+    size_t size = resource->gpuMemorySize();
     --fCount;
-    fBytes -= resource->gpuMemorySize();
-    SkASSERT(this->isInCache(resource));
-    fResources.remove(resource);    
+    fBytes -= size;
+    if (!resource->cacheAccess().isWrapped()) {
+        --fBudgetedCount;
+        fBudgetedBytes -= size;
+    }
+
+    fResources.remove(resource);
     if (!resource->cacheAccess().getScratchKey().isNullScratch()) {
         fScratchMap.remove(resource->cacheAccess().getScratchKey(), resource);
     }
     if (const GrResourceKey* contentKey = resource->cacheAccess().getContentKey()) {
         fContentHash.remove(*contentKey);
     }
 }
 
 void GrResourceCache2::abandonAll() {
     AutoValidate av(this);
 
     SkASSERT(!fPurging);
     while (GrGpuResource* head = fResources.head()) {
         SkASSERT(!head->wasDestroyed());
         head->cacheAccess().abandon();
         // abandon should have already removed this from the list.
         SkASSERT(head != fResources.head());
     }
     SkASSERT(!fScratchMap.count());
     SkASSERT(!fContentHash.count());
     SkASSERT(!fCount);
+    SkASSERT(!fBytes);
+    SkASSERT(!fBudgetedCount);
+    SkASSERT(!fBudgetedBytes);
 }
 
 void GrResourceCache2::releaseAll() {
     AutoValidate av(this);
 
     SkASSERT(!fPurging);
     while (GrGpuResource* head = fResources.head()) {
         SkASSERT(!head->wasDestroyed());
         head->cacheAccess().release();
         // release should have already removed this from the list.
         SkASSERT(head != fResources.head());
     }
     SkASSERT(!fScratchMap.count());
     SkASSERT(!fCount);
+    SkASSERT(!fBytes);
+    SkASSERT(!fBudgetedCount);
+    SkASSERT(!fBudgetedBytes);
 }
 
 class GrResourceCache2::AvailableForScratchUse {
 public:
     AvailableForScratchUse(bool rejectPendingIO) : fRejectPendingIO(rejectPendingIO) { }
 
     bool operator()(const GrGpuResource* resource) const {
         if (resource->internalHasRef() || !resource->cacheAccess().isScratch()) {
             return false;
         }
@@ skipping 65 matching lines @@
     SkASSERT(resource->isPurgable());
 
     // We can't purge if in the middle of purging because purge is iterating. Instead record
     // that additional resources became purgable.
     if (fPurging) {
         fNewlyPurgableResourceWhilePurging = true;
         return;
     }
 
     // Purge the resource if we're over budget
-    bool overBudget = fCount > fMaxCount || fBytes > fMaxBytes;
+    bool overBudget = fBudgetedCount > fMaxCount || fBudgetedBytes > fMaxBytes;
 
     // Also purge if the resource has neither a valid scratch key nor a content key.
     bool noKey = !resource->cacheAccess().isScratch() &&
                  (NULL == resource->cacheAccess().getContentKey());
 
+    // Wrapped resources should never have a key.
+    SkASSERT(noKey || !resource->cacheAccess().isWrapped());
+
+    // And purge if the resource is wrapped
     if (overBudget || noKey) {
         SkDEBUGCODE(int beforeCount = fCount;)
         resource->cacheAccess().release();
         // We should at least free this resource, perhaps dependent resources as well.
         SkASSERT(fCount < beforeCount);
     }
 
     this->validate();
 }
 
 void GrResourceCache2::didChangeGpuMemorySize(const GrGpuResource* resource, size_t oldSize) {
     // SkASSERT(!fPurging); GrPathRange increases size during flush. :(
     SkASSERT(resource);
     SkASSERT(this->isInCache(resource));
 
-    fBytes += resource->gpuMemorySize() - oldSize;
+    ptrdiff_t delta = resource->gpuMemorySize() - oldSize;
+
+    fBytes += delta;
 #if GR_CACHE_STATS
     fHighWaterBytes = SkTMax(fBytes, fHighWaterBytes);
 #endif
+    if (!resource->cacheAccess().isWrapped()) {
+        fBudgetedBytes += delta;
+#if GR_CACHE_STATS
+        fBudgetedHighWaterBytes = SkTMax(fBudgetedBytes, fBudgetedHighWaterBytes);
+#endif
+    }
 
     this->purgeAsNeeded();
     this->validate();
 }
 
 void GrResourceCache2::internalPurgeAsNeeded() {
     SkASSERT(!fPurging);
     SkASSERT(!fNewlyPurgableResourceWhilePurging);
-    SkASSERT(fCount > fMaxCount || fBytes > fMaxBytes);
+    SkASSERT(fBudgetedCount > fMaxCount || fBudgetedBytes > fMaxBytes);
 
     fPurging = true;
 
     AutoValidate av(this); // Put this after setting fPurging so we're allowed to be over budget.
 
     bool overBudget = true;
     do {
         fNewlyPurgableResourceWhilePurging = false;
         ResourceList::Iter resourceIter;
         GrGpuResource* resource = resourceIter.init(fResources,
                                                     ResourceList::Iter::kTail_IterStart);
 
         while (resource) {
             GrGpuResource* prev = resourceIter.prev();
             if (resource->isPurgable()) {
                 resource->cacheAccess().release();
             }
             resource = prev;
-            if (fCount <= fMaxCount && fBytes <= fMaxBytes) {
+            if (fBudgetedCount <= fMaxCount && fBudgetedBytes <= fMaxBytes) {
                 overBudget = false;
                 resource = NULL;
             }
         }
 
         if (!fNewlyPurgableResourceWhilePurging && overBudget && fOverBudgetCB) {
             // Despite the purge we're still over budget. Call our over budget callback.
             (*fOverBudgetCB)(fOverBudgetData);
         }
     } while (overBudget && fNewlyPurgableResourceWhilePurging);
@@ skipping 28 matching lines @@
             (*fOverBudgetCB)(fOverBudgetData);
         }
     } while (fNewlyPurgableResourceWhilePurging);
     fPurging = false;
 }
 
 #ifdef SK_DEBUG
 void GrResourceCache2::validate() const {
     size_t bytes = 0;
     int count = 0;
+    int budgetedCount = 0;
+    size_t budgetedBytes = 0;
     int locked = 0;
     int scratch = 0;
     int couldBeScratch = 0;
     int content = 0;
 
     ResourceList::Iter iter;
     GrGpuResource* resource = iter.init(fResources, ResourceList::Iter::kHead_IterStart);
     for ( ; resource; resource = iter.next()) {
         bytes += resource->gpuMemorySize();
         ++count;
 
         if (!resource->isPurgable()) {
             ++locked;
         }
 
         if (resource->cacheAccess().isScratch()) {
             SkASSERT(NULL == resource->cacheAccess().getContentKey());
             ++scratch;
             SkASSERT(fScratchMap.countForKey(resource->cacheAccess().getScratchKey()));
+            SkASSERT(!resource->cacheAccess().isWrapped());
         } else if (!resource->cacheAccess().getScratchKey().isNullScratch()) {
             SkASSERT(NULL != resource->cacheAccess().getContentKey());
             ++couldBeScratch;
             SkASSERT(fScratchMap.countForKey(resource->cacheAccess().getScratchKey()));
+            SkASSERT(!resource->cacheAccess().isWrapped());
         }
 
         if (const GrResourceKey* contentKey = resource->cacheAccess().getContentKey()) {
             ++content;
             SkASSERT(fContentHash.find(*contentKey) == resource);
+            SkASSERT(!resource->cacheAccess().isWrapped());
+        }
+
+        if (!resource->cacheAccess().isWrapped()) {
+            ++budgetedCount;
+            budgetedBytes += resource->gpuMemorySize();
         }
     }
 
+    SkASSERT(fBudgetedCount <= fCount);
+    SkASSERT(fBudgetedBytes <= fBudgetedBytes);
     SkASSERT(bytes == fBytes);
     SkASSERT(count == fCount);
+    SkASSERT(budgetedBytes == fBudgetedBytes);
+    SkASSERT(budgetedCount == fBudgetedCount);
 #if GR_CACHE_STATS
+    SkASSERT(fBudgetedHighWaterCount <= fHighWaterCount);
+    SkASSERT(fBudgetedHighWaterBytes <= fHighWaterBytes);
     SkASSERT(bytes <= fHighWaterBytes);
     SkASSERT(count <= fHighWaterCount);
+    SkASSERT(budgetedBytes <= fBudgetedHighWaterBytes);
+    SkASSERT(budgetedCount <= fBudgetedHighWaterCount);
 #endif
     SkASSERT(content == fContentHash.count());
     SkASSERT(scratch + couldBeScratch == fScratchMap.count());
 
     // This assertion is not currently valid because we can be in recursive notifyIsPurgable()
     // calls. This will be fixed when subresource registration is explicit.
-    // bool overBudget = bytes > fMaxBytes || count > fMaxCount;
+    // bool overBudget = budgetedBytes > fMaxBytes || budgetedCount > fMaxCount;
     // SkASSERT(!overBudget || locked == count || fPurging);
 }
 #endif
 
 #if GR_CACHE_STATS
 void GrResourceCache2::printStats() const {
     this->validate();
 
     int locked = 0;
     int scratch = 0;
 
     ResourceList::Iter iter;
     GrGpuResource* resource = iter.init(fResources, ResourceList::Iter::kHead_IterStart);
 
     for ( ; resource; resource = iter.next()) {
         if (!resource->isPurgable()) {
             ++locked;
         }
         if (resource->cacheAccess().isScratch()) {
             ++scratch;
         }
     }
 
-    float countUtilization = (100.f * fCount) / fMaxCount;
-    float byteUtilization = (100.f * fBytes) / fMaxBytes;
+    float countUtilization = (100.f * fBudgetedCount) / fMaxCount;
+    float byteUtilization = (100.f * fBudgetedBytes) / fMaxBytes;
 
     SkDebugf("Budget: %d items %d bytes\n", fMaxCount, fMaxBytes);
-    SkDebugf("\t\tEntry Count: current %d (%d locked, %d scratch %.2g%% full), high %d\n",
-                fCount, locked, scratch, countUtilization, fHighWaterCount);
-    SkDebugf("\t\tEntry Bytes: current %d (%.2g%% full) high %d\n",
-                fBytes, byteUtilization, fHighWaterBytes);
+    SkDebugf(
+        "\t\tEntry Count: current %d (%d budgeted, %d locked, %d scratch %.2g%% full), high %d\n",
+        fCount, fBudgetedCount, locked, scratch, countUtilization, fHighWaterCount);
+    SkDebugf("\t\tEntry Bytes: current %d (budgeted %d, %.2g%% full) high %d\n",
+                fBytes, fBudgetedBytes, byteUtilization, fHighWaterBytes);
 }
 
 #endif