<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162618] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162618">162618</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-23 09:53:14 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[curl] Add storage limit to cache manager
https://bugs.webkit.org/show_bug.cgi?id=125779
Patch by Mátyás Mustoha <mmatyas@inf.u-szeged.hu> on 2014-01-23
Reviewed by Brent Fulgham.
Sets a local disc storage size limit for the cache manager
used by the curl network backend.
* platform/network/curl/CurlCacheEntry.cpp:
(WebCore::CurlCacheEntry::CurlCacheEntry):
(WebCore::CurlCacheEntry::isCached):
(WebCore::CurlCacheEntry::saveCachedData):
(WebCore::CurlCacheEntry::readCachedData):
(WebCore::CurlCacheEntry::didFail):
(WebCore::CurlCacheEntry::didFinishLoading):
(WebCore::CurlCacheEntry::loadFileToBuffer):
(WebCore::CurlCacheEntry::parseResponseHeaders):
(WebCore::CurlCacheEntry::entrySize):
* platform/network/curl/CurlCacheEntry.h:
(WebCore::CurlCacheEntry::requestHeaders):
* platform/network/curl/CurlCacheManager.cpp:
(WebCore::CurlCacheManager::CurlCacheManager):
(WebCore::CurlCacheManager::setStorageSizeLimit):
(WebCore::CurlCacheManager::loadIndex):
(WebCore::CurlCacheManager::saveIndex):
(WebCore::CurlCacheManager::makeRoomForNewEntry):
(WebCore::CurlCacheManager::didReceiveResponse):
(WebCore::CurlCacheManager::didReceiveData):
(WebCore::CurlCacheManager::invalidateCacheEntry):
(WebCore::CurlCacheManager::readCachedData):
* platform/network/curl/CurlCacheManager.h:
(WebCore::CurlCacheManager::cacheDirectory):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheEntrycpp">trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheEntryh">trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheManagercpp">trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlCacheManagerh">trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162617 => 162618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-23 17:33:18 UTC (rev 162617)
+++ trunk/Source/WebCore/ChangeLog 2014-01-23 17:53:14 UTC (rev 162618)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-01-23 Mátyás Mustoha <mmatyas@inf.u-szeged.hu>
+
+ [curl] Add storage limit to cache manager
+ https://bugs.webkit.org/show_bug.cgi?id=125779
+
+ Reviewed by Brent Fulgham.
+
+ Sets a local disc storage size limit for the cache manager
+ used by the curl network backend.
+
+ * platform/network/curl/CurlCacheEntry.cpp:
+ (WebCore::CurlCacheEntry::CurlCacheEntry):
+ (WebCore::CurlCacheEntry::isCached):
+ (WebCore::CurlCacheEntry::saveCachedData):
+ (WebCore::CurlCacheEntry::readCachedData):
+ (WebCore::CurlCacheEntry::didFail):
+ (WebCore::CurlCacheEntry::didFinishLoading):
+ (WebCore::CurlCacheEntry::loadFileToBuffer):
+ (WebCore::CurlCacheEntry::parseResponseHeaders):
+ (WebCore::CurlCacheEntry::entrySize):
+ * platform/network/curl/CurlCacheEntry.h:
+ (WebCore::CurlCacheEntry::requestHeaders):
+ * platform/network/curl/CurlCacheManager.cpp:
+ (WebCore::CurlCacheManager::CurlCacheManager):
+ (WebCore::CurlCacheManager::setStorageSizeLimit):
+ (WebCore::CurlCacheManager::loadIndex):
+ (WebCore::CurlCacheManager::saveIndex):
+ (WebCore::CurlCacheManager::makeRoomForNewEntry):
+ (WebCore::CurlCacheManager::didReceiveResponse):
+ (WebCore::CurlCacheManager::didReceiveData):
+ (WebCore::CurlCacheManager::invalidateCacheEntry):
+ (WebCore::CurlCacheManager::readCachedData):
+ * platform/network/curl/CurlCacheManager.h:
+ (WebCore::CurlCacheManager::cacheDirectory):
+
</ins><span class="cx"> 2014-01-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix automake warning.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp (162617 => 162618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2014-01-23 17:33:18 UTC (rev 162617)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.cpp 2014-01-23 17:53:14 UTC (rev 162618)
</span><span class="lines">@@ -47,8 +47,9 @@
</span><span class="cx"> CurlCacheEntry::CurlCacheEntry(const String& url, const String& cacheDir)
</span><span class="cx"> : m_headerFilename(cacheDir)
</span><span class="cx"> , m_contentFilename(cacheDir)
</span><ins>+ , m_entrySize(0)
</ins><span class="cx"> , m_expireDate(-1)
</span><del>- , m_headerInMemory(false)
</del><ins>+ , m_headerParsed(false)
</ins><span class="cx"> {
</span><span class="cx"> generateBaseFilename(url.latin1());
</span><span class="cx">
</span><span class="lines">@@ -63,30 +64,28 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// cache manager should invalidate the entry on false
</del><ins>+// Cache manager should invalidate the entry on false
</ins><span class="cx"> bool CurlCacheEntry::isCached()
</span><span class="cx"> {
</span><span class="cx"> if (!fileExists(m_contentFilename) || !fileExists(m_headerFilename))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!m_headerInMemory) {
</del><ins>+ if (!m_headerParsed) {
</ins><span class="cx"> if (!loadResponseHeaders())
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_expireDate < currentTimeMS()) {
</span><del>- m_headerInMemory = false;
</del><ins>+ m_headerParsed = false;
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!entrySize())
+ return false;
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HTTPHeaderMap& CurlCacheEntry::requestHeaders()
-{
- return m_requestHeaders;
-}
-
</del><span class="cx"> bool CurlCacheEntry::saveCachedData(const char* data, size_t size)
</span><span class="cx"> {
</span><span class="cx"> PlatformFileHandle contentFile = openFile(m_contentFilename, OpenForWrite);
</span><span class="lines">@@ -95,14 +94,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // append
</del><ins>+ // Append
</ins><span class="cx"> seekFile(contentFile, 0, SeekFromEnd);
</span><span class="cx"> writeToFile(contentFile, data, size);
</span><span class="cx"> closeFile(contentFile);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CurlCacheEntry::loadCachedData(ResourceHandle* job)
</del><ins>+bool CurlCacheEntry::readCachedData(ResourceHandle* job)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(job->client());
</span><span class="cx">
</span><span class="lines">@@ -161,7 +160,7 @@
</span><span class="cx"> return parseResponseHeaders(m_cachedResponse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// set response headers from memory
</del><ins>+// Set response headers from memory
</ins><span class="cx"> void CurlCacheEntry::setResponseFromCachedHeaders(ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> response.setHTTPStatusCode(304);
</span><span class="lines">@@ -193,12 +192,12 @@
</span><span class="cx">
</span><span class="cx"> void CurlCacheEntry::didFail()
</span><span class="cx"> {
</span><del>- // the cache manager will call invalidate()
</del><ins>+ // The cache manager will call invalidate()
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CurlCacheEntry::didFinishLoading()
</span><span class="cx"> {
</span><del>- // nothing to do here yet
</del><ins>+ // Nothing to do here yet
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CurlCacheEntry::generateBaseFilename(const CString& url)
</span><span class="lines">@@ -216,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> bool CurlCacheEntry::loadFileToBuffer(const String& filepath, Vector<char>& buffer)
</span><span class="cx"> {
</span><del>- // open the file
</del><ins>+ // Open the file
</ins><span class="cx"> PlatformFileHandle inputFile = openFile(filepath, OpenForRead);
</span><span class="cx"> if (!isHandleValid(inputFile)) {
</span><span class="cx"> LOG(Network, "Cache Error: Could not open %s for read\n", filepath.latin1().data());
</span><span class="lines">@@ -230,7 +229,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // load the file content into buffer
</del><ins>+ // Load the file content into buffer
</ins><span class="cx"> buffer.resize(filesize);
</span><span class="cx"> int bufferPosition = 0;
</span><span class="cx"> int bufferReadSize = 4096;
</span><span class="lines">@@ -309,14 +308,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (maxAgeIsValid) {
</span><del>- // when both the cache entry and the response contain max-age, the lesser one takes priority
</del><ins>+ // When both the cache entry and the response contain max-age, the lesser one takes priority
</ins><span class="cx"> double expires = fileTime + maxAge * 1000;
</span><span class="cx"> if (m_expireDate == -1 || m_expireDate > expires)
</span><span class="cx"> m_expireDate = expires;
</span><span class="cx"> } else if (responseDate > 0 && expirationDate >= responseDate)
</span><span class="cx"> m_expireDate = fileTime + (expirationDate - responseDate);
</span><span class="cx">
</span><del>- // if there were no lifetime information
</del><ins>+ // If there is no lifetime information
</ins><span class="cx"> if (m_expireDate == -1) {
</span><span class="cx"> if (lastModificationDate > 0)
</span><span class="cx"> m_expireDate = fileTime + (fileTime - lastModificationDate) * 0.1;
</span><span class="lines">@@ -335,8 +334,29 @@
</span><span class="cx"> if (etag.isNull() && lastModified.isNull())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- m_headerInMemory = true;
</del><ins>+ m_headerParsed = true;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+size_t CurlCacheEntry::entrySize()
+{
+ if (!m_entrySize) {
+ long long headerFileSize;
+ long long contentFileSize;
+
+ if (!getFileSize(m_headerFilename, headerFileSize)) {
+ LOG(Network, "Cache Error: Could not get file size of %s\n", m_headerFilename.latin1().data());
+ return m_entrySize;
+ }
+ if (!getFileSize(m_contentFilename, contentFileSize)) {
+ LOG(Network, "Cache Error: Could not get file size of %s\n", m_contentFilename.latin1().data());
+ return m_entrySize;
+ }
+
+ m_entrySize = headerFileSize + contentFileSize;
+ }
+
+ return m_entrySize;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheEntryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.h (162617 => 162618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.h 2014-01-23 17:33:18 UTC (rev 162617)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheEntry.h 2014-01-23 17:53:14 UTC (rev 162618)
</span><span class="lines">@@ -44,11 +44,11 @@
</span><span class="cx"> ~CurlCacheEntry();
</span><span class="cx">
</span><span class="cx"> bool isCached();
</span><del>- const bool& isInMemory() { return m_headerInMemory; }
- HTTPHeaderMap& requestHeaders();
</del><ins>+ size_t entrySize();
+ HTTPHeaderMap& requestHeaders() { return m_requestHeaders; }
</ins><span class="cx">
</span><span class="cx"> bool saveCachedData(const char* data, size_t);
</span><del>- bool loadCachedData(ResourceHandle*);
</del><ins>+ bool readCachedData(ResourceHandle*);
</ins><span class="cx">
</span><span class="cx"> bool saveResponseHeaders(ResourceResponse&);
</span><span class="cx"> void setResponseFromCachedHeaders(ResourceResponse&);
</span><span class="lines">@@ -64,8 +64,9 @@
</span><span class="cx"> String m_headerFilename;
</span><span class="cx"> String m_contentFilename;
</span><span class="cx">
</span><ins>+ size_t m_entrySize;
</ins><span class="cx"> double m_expireDate;
</span><del>- bool m_headerInMemory;
</del><ins>+ bool m_headerParsed;
</ins><span class="cx">
</span><span class="cx"> ResourceResponse m_cachedResponse;
</span><span class="cx"> HTTPHeaderMap m_requestHeaders;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp (162617 => 162618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp 2014-01-23 17:33:18 UTC (rev 162617)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheManager.cpp 2014-01-23 17:53:14 UTC (rev 162618)
</span><span class="lines">@@ -48,8 +48,10 @@
</span><span class="cx">
</span><span class="cx"> CurlCacheManager::CurlCacheManager()
</span><span class="cx"> : m_disabled(true)
</span><ins>+ , m_currentStorageSize(0)
+ , m_storageSizeLimit(52428800) // 50 * 1024 * 1024 bytes
</ins><span class="cx"> {
</span><del>- // call setCacheDirectory() to enable
</del><ins>+ // Call setCacheDirectory() to enable the Cache Manager
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CurlCacheManager::~CurlCacheManager()
</span><span class="lines">@@ -82,6 +84,11 @@
</span><span class="cx"> loadIndex();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CurlCacheManager::setStorageSizeLimit(size_t sizeLimit)
+{
+ m_storageSizeLimit = sizeLimit;
+}
+
</ins><span class="cx"> void CurlCacheManager::loadIndex()
</span><span class="cx"> {
</span><span class="cx"> if (m_disabled)
</span><span class="lines">@@ -102,7 +109,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // load the file content into buffer
</del><ins>+ // Load the file content into buffer
</ins><span class="cx"> Vector<char> buffer;
</span><span class="cx"> buffer.resize(filesize);
</span><span class="cx"> int bufferPosition = 0;
</span><span class="lines">@@ -116,23 +123,28 @@
</span><span class="cx"> }
</span><span class="cx"> closeFile(indexFile);
</span><span class="cx">
</span><del>- // create strings from buffer
</del><ins>+ // Create strings from buffer
</ins><span class="cx"> String headerContent = String(buffer.data());
</span><span class="cx"> Vector<String> indexURLs;
</span><span class="cx"> headerContent.split("\n", indexURLs);
</span><span class="cx"> buffer.clear();
</span><span class="cx">
</span><del>- // add entries to index
</del><ins>+ // Add entries to index
</ins><span class="cx"> Vector<String>::const_iterator it = indexURLs.begin();
</span><span class="cx"> Vector<String>::const_iterator end = indexURLs.end();
</span><span class="cx"> if (indexURLs.size() > 1)
</span><del>- --end; // last line is empty
</del><ins>+ --end; // Last line is empty
</ins><span class="cx"> while (it != end) {
</span><span class="cx"> String url = it->stripWhiteSpace();
</span><ins>+ std::unique_ptr<CurlCacheEntry> cacheEntry(new CurlCacheEntry(url, m_cacheDir));
</ins><span class="cx">
</span><del>- std::unique_ptr<CurlCacheEntry> cacheEntry(new CurlCacheEntry(url, m_cacheDir));
- if (cacheEntry->isCached())
</del><ins>+ if (cacheEntry->isCached() && cacheEntry->entrySize() < m_storageSizeLimit) {
+ m_currentStorageSize += cacheEntry->entrySize();
+ makeRoomForNewEntry();
+ m_LRUEntryList.prependOrMoveToFirst(url);
</ins><span class="cx"> m_index.set(url, std::move(cacheEntry));
</span><ins>+ } else
+ cacheEntry->invalidate();
</ins><span class="cx">
</span><span class="cx"> ++it;
</span><span class="cx"> }
</span><span class="lines">@@ -146,16 +158,17 @@
</span><span class="cx"> String indexFilePath(m_cacheDir);
</span><span class="cx"> indexFilePath.append("index.dat");
</span><span class="cx">
</span><ins>+ deleteFile(indexFilePath);
</ins><span class="cx"> PlatformFileHandle indexFile = openFile(indexFilePath, OpenForWrite);
</span><span class="cx"> if (!isHandleValid(indexFile)) {
</span><span class="cx"> LOG(Network, "Cache Error: Could not open %s for write\n", indexFilePath.latin1().data());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HashMap<String, std::unique_ptr<CurlCacheEntry>>::const_iterator it = m_index.begin();
- HashMap<String, std::unique_ptr<CurlCacheEntry>>::const_iterator end = m_index.end();
</del><ins>+ auto it = m_LRUEntryList.begin();
+ const auto& end = m_LRUEntryList.end();
</ins><span class="cx"> while (it != end) {
</span><del>- const CString& urlLatin1 = it->key.latin1();
</del><ins>+ const CString& urlLatin1 = it->latin1();
</ins><span class="cx"> writeToFile(indexFile, urlLatin1.data(), urlLatin1.length());
</span><span class="cx"> writeToFile(indexFile, "\n", 1);
</span><span class="cx"> ++it;
</span><span class="lines">@@ -164,6 +177,17 @@
</span><span class="cx"> closeFile(indexFile);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CurlCacheManager::makeRoomForNewEntry()
+{
+ if (m_disabled)
+ return;
+
+ while (m_currentStorageSize > m_storageSizeLimit) {
+ ASSERT(m_index.find(m_LRUEntryList.last()) != m_index.end());
+ invalidateCacheEntry(m_LRUEntryList.last());
+ }
+}
+
</ins><span class="cx"> void CurlCacheManager::didReceiveResponse(ResourceHandle* job, ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> if (m_disabled)
</span><span class="lines">@@ -171,20 +195,20 @@
</span><span class="cx">
</span><span class="cx"> String url = job->firstRequest().url().string();
</span><span class="cx">
</span><del>- if (response.httpStatusCode() == 304)
- loadCachedData(url, job, response);
</del><ins>+ if (response.httpStatusCode() == 304) {
+ readCachedData(url, job, response);
+ m_LRUEntryList.prependOrMoveToFirst(url);
+ }
</ins><span class="cx"> else if (response.httpStatusCode() == 200) {
</span><del>- HashMap<String, std::unique_ptr<CurlCacheEntry>>::iterator it = m_index.find(url);
- if (it != m_index.end())
- invalidateCacheEntry(url);
</del><ins>+ invalidateCacheEntry(url); // Invalidate existing entry on 200
</ins><span class="cx">
</span><del>- std::unique_ptr<CurlCacheEntry> entry(new CurlCacheEntry(url, m_cacheDir));
- bool cacheable = entry->parseResponseHeaders(response);
</del><ins>+ std::unique_ptr<CurlCacheEntry> cacheEntry(new CurlCacheEntry(url, m_cacheDir));
+ bool cacheable = cacheEntry->parseResponseHeaders(response);
</ins><span class="cx"> if (cacheable) {
</span><del>- m_index.set(url, std::move(entry));
</del><ins>+ m_LRUEntryList.prependOrMoveToFirst(url);
+ m_index.set(url, std::move(cacheEntry));
</ins><span class="cx"> saveResponseHeaders(url, response);
</span><del>- } else
- entry->invalidate();
</del><ins>+ }
</ins><span class="cx"> } else
</span><span class="cx"> invalidateCacheEntry(url);
</span><span class="cx"> }
</span><span class="lines">@@ -226,9 +250,16 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> HashMap<String, std::unique_ptr<CurlCacheEntry>>::iterator it = m_index.find(url);
</span><del>- if (it != m_index.end())
</del><ins>+ if (it != m_index.end()) {
</ins><span class="cx"> if (!it->value->saveCachedData(data, size))
</span><span class="cx"> invalidateCacheEntry(url);
</span><ins>+
+ else {
+ m_currentStorageSize += size;
+ m_LRUEntryList.prependOrMoveToFirst(url);
+ makeRoomForNewEntry();
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CurlCacheManager::saveResponseHeaders(const String& url, ResourceResponse& response)
</span><span class="lines">@@ -249,7 +280,13 @@
</span><span class="cx">
</span><span class="cx"> HashMap<String, std::unique_ptr<CurlCacheEntry>>::iterator it = m_index.find(url);
</span><span class="cx"> if (it != m_index.end()) {
</span><ins>+ if (m_currentStorageSize < it->value->entrySize())
+ m_currentStorageSize = 0;
+ else
+ m_currentStorageSize -= it->value->entrySize();
+
</ins><span class="cx"> it->value->invalidate();
</span><ins>+ m_LRUEntryList.remove(url);
</ins><span class="cx"> m_index.remove(url);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -259,7 +296,7 @@
</span><span class="cx"> invalidateCacheEntry(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CurlCacheManager::loadCachedData(const String& url, ResourceHandle* job, ResourceResponse& response)
</del><ins>+void CurlCacheManager::readCachedData(const String& url, ResourceHandle* job, ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> if (m_disabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -267,7 +304,8 @@
</span><span class="cx"> HashMap<String, std::unique_ptr<CurlCacheEntry>>::iterator it = m_index.find(url);
</span><span class="cx"> if (it != m_index.end()) {
</span><span class="cx"> it->value->setResponseFromCachedHeaders(response);
</span><del>- if (!it->value->loadCachedData(job))
</del><ins>+ m_LRUEntryList.prependOrMoveToFirst(url);
+ if (!it->value->readCachedData(job))
</ins><span class="cx"> invalidateCacheEntry(url);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlCacheManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h (162617 => 162618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h 2014-01-23 17:33:18 UTC (rev 162617)
+++ trunk/Source/WebCore/platform/network/curl/CurlCacheManager.h 2014-01-23 17:53:14 UTC (rev 162618)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/ListHashSet.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -40,16 +41,17 @@
</span><span class="cx"> public:
</span><span class="cx"> static CurlCacheManager& getInstance();
</span><span class="cx">
</span><del>- const String& getCacheDirectory() { return m_cacheDir; }
</del><span class="cx"> void setCacheDirectory(const String&);
</span><ins>+ const String& cacheDirectory() { return m_cacheDir; }
+ void setStorageSizeLimit(size_t);
</ins><span class="cx">
</span><span class="cx"> bool isCached(const String&);
</span><del>- HTTPHeaderMap& requestHeaders(const String&); // load headers
</del><ins>+ HTTPHeaderMap& requestHeaders(const String&); // Load headers
</ins><span class="cx">
</span><span class="cx"> void didReceiveResponse(ResourceHandle*, ResourceResponse&);
</span><del>- void didReceiveData(const String&, const char*, size_t); // save data
</del><ins>+ void didReceiveData(const String&, const char*, size_t); // Save data
+ void didFinishLoading(const String&);
</ins><span class="cx"> void didFail(const String&);
</span><del>- void didFinishLoading(const String&);
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CurlCacheManager();
</span><span class="lines">@@ -57,16 +59,21 @@
</span><span class="cx"> CurlCacheManager(CurlCacheManager const&);
</span><span class="cx"> void operator=(CurlCacheManager const&);
</span><span class="cx">
</span><ins>+ bool m_disabled;
</ins><span class="cx"> String m_cacheDir;
</span><span class="cx"> HashMap<String, std::unique_ptr<CurlCacheEntry>> m_index;
</span><del>- bool m_disabled;
</del><span class="cx">
</span><ins>+ ListHashSet<String> m_LRUEntryList;
+ size_t m_currentStorageSize;
+ size_t m_storageSizeLimit;
+
</ins><span class="cx"> void saveIndex();
</span><span class="cx"> void loadIndex();
</span><ins>+ void makeRoomForNewEntry();
</ins><span class="cx">
</span><span class="cx"> void saveResponseHeaders(const String&, ResourceResponse&);
</span><span class="cx"> void invalidateCacheEntry(const String&);
</span><del>- void loadCachedData(const String&, ResourceHandle*, ResourceResponse&);
</del><ins>+ void readCachedData(const String&, ResourceHandle*, ResourceResponse&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>