<!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>[179431] 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/179431">179431</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-30 17:39:28 -0800 (Fri, 30 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Optimize MemoryCache::getSessionMap() a bit
https://bugs.webkit.org/show_bug.cgi?id=141069
Reviewed by Anders Carlsson.
Optimize MemoryCache::getSessionMap() a bit by doing 1 HashMap lookup
instead of previously 3. Also rename the method to
ensureSessionResourceMap() as we usually don't use "get" prefix for
getters and the implementation will also create the HashMap value if
the key is not found.
Also add a alternative sessionResourceMap() method which returns
the HashMap value if the key exists but doesn't try to create it if
missing. This is actually what we really want for some call sites.
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::add):
(WebCore::MemoryCache::revalidationSucceeded):
(WebCore::MemoryCache::resourceForRequest):
(WebCore::MemoryCache::removeImageFromCache):
(WebCore::MemoryCache::remove):
(WebCore::MemoryCache::getSessionMap): Deleted.
* loader/cache/MemoryCache.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179430 => 179431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-31 01:28:05 UTC (rev 179430)
+++ trunk/Source/WebCore/ChangeLog 2015-01-31 01:39:28 UTC (rev 179431)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-01-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Optimize MemoryCache::getSessionMap() a bit
+ https://bugs.webkit.org/show_bug.cgi?id=141069
+
+ Reviewed by Anders Carlsson.
+
+ Optimize MemoryCache::getSessionMap() a bit by doing 1 HashMap lookup
+ instead of previously 3. Also rename the method to
+ ensureSessionResourceMap() as we usually don't use "get" prefix for
+ getters and the implementation will also create the HashMap value if
+ the key is not found.
+
+ Also add a alternative sessionResourceMap() method which returns
+ the HashMap value if the key exists but doesn't try to create it if
+ missing. This is actually what we really want for some call sites.
+
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::add):
+ (WebCore::MemoryCache::revalidationSucceeded):
+ (WebCore::MemoryCache::resourceForRequest):
+ (WebCore::MemoryCache::removeImageFromCache):
+ (WebCore::MemoryCache::remove):
+ (WebCore::MemoryCache::getSessionMap): Deleted.
+ * loader/cache/MemoryCache.h:
+
+2015-01-30 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Unreviewed. Remove outdated comment.
</span><span class="cx">
</span><span class="cx"> * loader/cache/MemoryCache.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (179430 => 179431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-01-31 01:28:05 UTC (rev 179430)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-01-31 01:39:28 UTC (rev 179431)
</span><span class="lines">@@ -74,14 +74,18 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MemoryCache::CachedResourceMap& MemoryCache::getSessionMap(SessionID sessionID)
</del><ins>+auto MemoryCache::sessionResourceMap(SessionID sessionID) const -> CachedResourceMap*
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(sessionID.isValid());
</span><del>- CachedResourceMap* map = m_sessionResources.get(sessionID);
- if (!map) {
- m_sessionResources.set(sessionID, std::make_unique<CachedResourceMap>());
- map = m_sessionResources.get(sessionID);
- }
</del><ins>+ return m_sessionResources.get(sessionID);
+}
+
+auto MemoryCache::ensureSessionResourceMap(SessionID sessionID) -> CachedResourceMap&
+{
+ ASSERT(sessionID.isValid());
+ auto& map = m_sessionResources.add(sessionID, nullptr).iterator->value;
+ if (!map)
+ map = std::make_unique<CachedResourceMap>();
</ins><span class="cx"> return *map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -106,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(WTF::isMainThread());
</span><span class="cx">
</span><del>- CachedResourceMap& resources = getSessionMap(resource.sessionID());
</del><ins>+ auto& resources = ensureSessionResourceMap(resource.sessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> CachedResourceItem* originMap = resources.get(resource.url());
</span><span class="cx"> if (!originMap) {
</span><span class="lines">@@ -140,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> remove(revalidatingResource);
</span><span class="cx">
</span><del>- CachedResourceMap& resources = getSessionMap(resource.sessionID());
</del><ins>+ auto& resources = ensureSessionResourceMap(resource.sessionID());
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> ASSERT(!resources.get(resource.url()) || !resources.get(resource.url())->get(resource.cachePartition()));
</span><span class="cx"> CachedResourceItem* originMap = resources.get(resource.url());
</span><span class="lines">@@ -183,7 +187,10 @@
</span><span class="cx">
</span><span class="cx"> CachedResource* MemoryCache::resourceForRequest(const ResourceRequest& request, SessionID sessionID)
</span><span class="cx"> {
</span><del>- return resourceForRequestImpl(request, getSessionMap(sessionID));
</del><ins>+ auto* resources = sessionResourceMap(sessionID);
+ if (!resources)
+ return nullptr;
+ return resourceForRequestImpl(request, *resources);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResource* MemoryCache::resourceForRequestImpl(const ResourceRequest& request, CachedResourceMap& resources)
</span><span class="lines">@@ -250,16 +257,19 @@
</span><span class="cx">
</span><span class="cx"> void MemoryCache::removeImageFromCache(const URL& url, const String& domainForCachePartition)
</span><span class="cx"> {
</span><del>- CachedResourceMap& resources = getSessionMap(SessionID::defaultSessionID());
</del><ins>+ auto* resources = sessionResourceMap(SessionID::defaultSessionID());
+ if (!resources)
+ return;
+
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> CachedResource* resource;
</span><del>- if (CachedResourceItem* item = resources.get(url))
</del><ins>+ if (CachedResourceItem* item = resources->get(url))
</ins><span class="cx"> resource = item->get(ResourceRequest::partitionName(domainForCachePartition));
</span><span class="cx"> else
</span><span class="cx"> resource = nullptr;
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(domainForCachePartition);
</span><del>- CachedResource* resource = resources.get(url);
</del><ins>+ CachedResource* resource = resources->get(url);
</ins><span class="cx"> #endif
</span><span class="cx"> if (!resource)
</span><span class="cx"> return;
</span><span class="lines">@@ -417,31 +427,33 @@
</span><span class="cx"> LOG(ResourceLoading, "Evicting resource %p for '%s' from cache", &resource, resource.url().string().latin1().data());
</span><span class="cx"> // The resource may have already been removed by someone other than our caller,
</span><span class="cx"> // who needed a fresh copy for a reload. See <http://bugs.webkit.org/show_bug.cgi?id=12479#c6>.
</span><del>- CachedResourceMap& resources = getSessionMap(resource.sessionID());
- if (resource.inCache()) {
- // Remove from the resource map.
</del><ins>+ if (auto* resources = sessionResourceMap(resource.sessionID())) {
+ if (resource.inCache()) {
+ // Remove from the resource map.
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- CachedResourceItem* item = resources.get(resource.url());
- if (item) {
- item->remove(resource.cachePartition());
- if (!item->size())
- resources.remove(resource.url());
- }
</del><ins>+ CachedResourceItem* item = resources->get(resource.url());
+ if (item) {
+ item->remove(resource.cachePartition());
+ if (!item->size())
+ resources->remove(resource.url());
+ }
</ins><span class="cx"> #else
</span><del>- resources.remove(resource.url());
</del><ins>+ resources->remove(resource.url());
</ins><span class="cx"> #endif
</span><del>- resource.setInCache(false);
</del><ins>+ resource.setInCache(false);
</ins><span class="cx">
</span><del>- // Remove from the appropriate LRU list.
- removeFromLRUList(resource);
- removeFromLiveDecodedResourcesList(resource);
- adjustSize(resource.hasClients(), -static_cast<int>(resource.size()));
- } else
</del><ins>+ // Remove from the appropriate LRU list.
+ removeFromLRUList(resource);
+ removeFromLiveDecodedResourcesList(resource);
+ adjustSize(resource.hasClients(), -static_cast<int>(resource.size()));
+ } else {
</ins><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><del>- ASSERT(!resources.get(resource.url()) || resources.get(resource.url())->get(resource.cachePartition()) != &resource);
</del><ins>+ ASSERT(!resources->get(resource.url()) || resources->get(resource.url())->get(resource.cachePartition()) != &resource);
</ins><span class="cx"> #else
</span><del>- ASSERT(resources.get(resource.url()) != &resource);
</del><ins>+ ASSERT(resources->get(resource.url()) != &resource);
</ins><span class="cx"> #endif
</span><ins>+ }
+ }
</ins><span class="cx">
</span><span class="cx"> resource.deleteIfPossible();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (179430 => 179431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-01-31 01:28:05 UTC (rev 179430)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-01-31 01:39:28 UTC (rev 179431)
</span><span class="lines">@@ -186,8 +186,10 @@
</span><span class="cx"> unsigned deadCapacity() const;
</span><span class="cx">
</span><span class="cx"> CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
</span><del>- CachedResourceMap& getSessionMap(SessionID);
</del><span class="cx">
</span><ins>+ CachedResourceMap& ensureSessionResourceMap(SessionID);
+ CachedResourceMap* sessionResourceMap(SessionID) const;
+
</ins><span class="cx"> bool m_disabled; // Whether or not the cache is enabled.
</span><span class="cx"> bool m_inPruneResources;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>