From e70e435dcca6e7ad21656e90af083da9b60609d8 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 12 Jan 2015 12:45:13 -0800 Subject: [PATCH] Added Min/Max values for cache size --- libraries/networking/src/ResourceCache.cpp | 1 + libraries/networking/src/ResourceCache.h | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 089cdc5607..1187b311fc 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -166,6 +166,7 @@ Resource::~Resource() { if (_reply) { ResourceCache::requestCompleted(this); delete _reply; + _reply = nullptr; } } diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h index 8b5f1abc75..0c2b6d2ce8 100644 --- a/libraries/networking/src/ResourceCache.h +++ b/libraries/networking/src/ResourceCache.h @@ -28,7 +28,10 @@ class QTimer; class Resource; static constexpr qint64 BYTES_PER_MEGABYTES = 1024 * 1024; -static constexpr qint64 DEFAULT_MAX_SIZE = 100 * BYTES_PER_MEGABYTES; +static constexpr qint64 BYTES_PER_GIGABYTES = 1024 * BYTES_PER_MEGABYTES; +static constexpr qint64 DEFAULT_UNUSED_MAX_SIZE = 100 * BYTES_PER_MEGABYTES; +static constexpr qint64 MIN_UNUSED_MAX_SIZE = 0; +static constexpr qint64 MAX_UNUSED_MAX_SIZE = 10 * BYTES_PER_GIGABYTES; /// Base class for resource caches. class ResourceCache : public QObject { @@ -51,7 +54,7 @@ public: void refresh(const QUrl& url); protected: - qint64 _unusedResourcesMaxSize = DEFAULT_MAX_SIZE; + qint64 _unusedResourcesMaxSize = DEFAULT_UNUSED_MAX_SIZE; qint64 _unusedResourcesSize = 0; QMap > _unusedResources;