<!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>[160307] trunk/Source/WebKit2</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/160307">160307</a></dd>
<dt>Author</dt> <dd>kseo@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-09 04:06:40 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][Soup] Support cache model in NetworkProcess
https://bugs.webkit.org/show_bug.cgi?id=118343
Reviewed by Carlos Garcia Campos.
Original patch by Kwang Yul Seo <skyul@company100.net> and Csaba Osztrogonác <ossy@webkit.org>.
Copied cache model code from WebProcess.
NetworkProcess is configured not to use the WebCore memory cache.
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::getCacheDiskFreeSize):
(WebKit::getMemorySize):
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
Initialize soup cache.
(WebKit::NetworkProcess::platformSetCacheModel):
Copied code from WebProcess::platformSetCacheModel but removed
WebCore memory cache initialization because NetworkProcess does not use
the WebCore memory cache.
(WebKit::NetworkProcess::clearCacheForAllOrigins):
Copied code from WebProcess::clearCacheForAllOrigins.
* NetworkProcess/unix/NetworkProcessMainUnix.cpp:
Copied initialization code from WebProcessMainGtk.cpp.
(WebKit::NetworkProcessMain):
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::WebProcess::platformSetCacheModel):
Don't set the disk cache if NetworkProcess is used.
(WebKit::WebProcess::platformClearResourceCaches):
Don't clear the non-existing disk cache. (if NetworkProcess is used)
(WebKit::WebProcess::platformInitializeWebProcess):
Don't initialize the disk cache if NetworkProcess is used.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessunixNetworkProcessMainUnixcpp">trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp">trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160306 => 160307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-09 11:49:27 UTC (rev 160306)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-09 12:06:40 UTC (rev 160307)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2013-12-09 Kwang Yul Seo <skyul@company100.net>
+
+ [WK2][Soup] Support cache model in NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=118343
+
+ Reviewed by Carlos Garcia Campos.
+
+ Original patch by Kwang Yul Seo <skyul@company100.net> and Csaba Osztrogonác <ossy@webkit.org>.
+
+ Copied cache model code from WebProcess.
+ NetworkProcess is configured not to use the WebCore memory cache.
+
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::getCacheDiskFreeSize):
+ (WebKit::getMemorySize):
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+ Initialize soup cache.
+ (WebKit::NetworkProcess::platformSetCacheModel):
+ Copied code from WebProcess::platformSetCacheModel but removed
+ WebCore memory cache initialization because NetworkProcess does not use
+ the WebCore memory cache.
+ (WebKit::NetworkProcess::clearCacheForAllOrigins):
+ Copied code from WebProcess::clearCacheForAllOrigins.
+ * NetworkProcess/unix/NetworkProcessMainUnix.cpp:
+ Copied initialization code from WebProcessMainGtk.cpp.
+ (WebKit::NetworkProcessMain):
+ * WebProcess/soup/WebProcessSoup.cpp:
+ (WebKit::WebProcess::platformSetCacheModel):
+ Don't set the disk cache if NetworkProcess is used.
+ (WebKit::WebProcess::platformClearResourceCaches):
+ Don't clear the non-existing disk cache. (if NetworkProcess is used)
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ Don't initialize the disk cache if NetworkProcess is used.
+
</ins><span class="cx"> 2013-12-09 Gustavo Noronha Silva <gns@gnome.org>
</span><span class="cx">
</span><span class="cx"> [GTK] run-webkit-tests may DOS the system, specially in debug builds
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (160306 => 160307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2013-12-09 11:49:27 UTC (rev 160306)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2013-12-09 12:06:40 UTC (rev 160307)
</span><span class="lines">@@ -29,21 +29,81 @@
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><ins>+#include "ResourceCachesToClear.h"
+#include <WebCore/FileSystem.h>
</ins><span class="cx"> #include <WebCore/NotImplemented.h>
</span><ins>+#include <WebCore/ResourceHandle.h>
+#include <libsoup/soup.h>
+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters&)
</del><ins>+static uint64_t getCacheDiskFreeSize(SoupCache* cache)
</ins><span class="cx"> {
</span><ins>+ ASSERT(cache);
+
+ GOwnPtr<char> cacheDir;
+ g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);
+ if (!cacheDir)
+ return 0;
+
+ return WebCore::getVolumeFreeSizeForPath(cacheDir.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::platformSetCacheModel(CacheModel)
</del><ins>+static uint64_t getMemorySize()
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ static uint64_t kDefaultMemorySize = 512;
+#if !OS(WINDOWS)
+ long pageSize = sysconf(_SC_PAGESIZE);
+ if (pageSize == -1)
+ return kDefaultMemorySize;
+
+ long physPages = sysconf(_SC_PHYS_PAGES);
+ if (physPages == -1)
+ return kDefaultMemorySize;
+
+ return ((pageSize / 1024) * physPages) / 1024;
+#else
+ // Fallback to default for other platforms.
+ return kDefaultMemorySize;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
+{
+ ASSERT(!parameters.diskCacheDirectory.isEmpty());
+ GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(parameters.diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
+ soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
+ soup_cache_load(soupCache.get());
+}
+
+void NetworkProcess::platformSetCacheModel(CacheModel cacheModel)
+{
+ unsigned cacheTotalCapacity = 0;
+ unsigned cacheMinDeadCapacity = 0;
+ unsigned cacheMaxDeadCapacity = 0;
+ double deadDecodedDataDeletionInterval = 0;
+ unsigned pageCacheCapacity = 0;
+
+ unsigned long urlCacheMemoryCapacity = 0;
+ unsigned long urlCacheDiskCapacity = 0;
+
+ SoupSession* session = ResourceHandle::defaultSession();
+ SoupCache* cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));
+ uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
+
+ uint64_t memSize = getMemorySize();
+ calculateCacheSizes(cacheModel, memSize, diskFreeSize,
+ cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval,
+ pageCacheCapacity, urlCacheMemoryCapacity, urlCacheDiskCapacity);
+
+ if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
+ soup_cache_set_max_size(cache, urlCacheDiskCapacity);
+}
+
</ins><span class="cx"> void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String&)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="lines">@@ -51,7 +111,11 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
</span><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ if (cachesToClear == InMemoryResourceCachesOnly)
+ return;
+
+ SoupSession* session = ResourceHandle::defaultSession();
+ soup_cache_clear(SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformTerminate()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessunixNetworkProcessMainUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp (160306 => 160307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp 2013-12-09 11:49:27 UTC (rev 160306)
+++ trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp 2013-12-09 12:06:40 UTC (rev 160307)
</span><span class="lines">@@ -45,6 +45,10 @@
</span><span class="cx"> #include <Ecore.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+#include <libsoup/soup.h>
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -65,7 +69,7 @@
</span><span class="cx"> InitializeWebKit2();
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><del>- SoupSession* session = WebCore::ResourceHandle::defaultSession();
</del><ins>+ SoupSession* session = ResourceHandle::defaultSession();
</ins><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx"> // Only for EFL because GTK port uses the default resolver, which uses GIO's proxy resolver.
</span><span class="cx"> const char* httpProxy = getenv("http_proxy");
</span><span class="lines">@@ -84,8 +88,23 @@
</span><span class="cx">
</span><span class="cx"> NetworkProcess::shared().initialize(parameters);
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+ // Despite using system CAs to validate certificates we're
+ // accepting invalid certificates by default. New API will be
+ // added later to let client accept/discard invalid certificates.
+ g_object_set(session, SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
+ SOUP_SESSION_SSL_STRICT, FALSE, NULL);
+#endif
+
</ins><span class="cx"> RunLoop::run();
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+ if (SoupSessionFeature* soupCache = soup_session_get_feature(session, SOUP_TYPE_CACHE)) {
+ soup_cache_flush(SOUP_CACHE(soupCache));
+ soup_cache_dump(SOUP_CACHE(soupCache));
+ }
+#endif
+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (160306 => 160307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-09 11:49:27 UTC (rev 160306)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-09 12:06:40 UTC (rev 160307)
</span><span class="lines">@@ -90,10 +90,18 @@
</span><span class="cx"> unsigned long urlCacheMemoryCapacity = 0;
</span><span class="cx"> unsigned long urlCacheDiskCapacity = 0;
</span><span class="cx">
</span><del>- SoupSession* session = WebCore::ResourceHandle::defaultSession();
- SoupCache* cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));
- uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
</del><ins>+ uint64_t diskFreeSize = 0;
+ SoupCache* cache = nullptr;
</ins><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (!m_usesNetworkProcess) {
+#endif
+ SoupSession* session = WebCore::ResourceHandle::defaultSession();
+ cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));
+ diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
+#if ENABLE(NETWORK_PROCESS)
+ }
+#endif
</ins><span class="cx"> uint64_t memSize = getMemorySize();
</span><span class="cx"> calculateCacheSizes(cacheModel, memSize, diskFreeSize,
</span><span class="cx"> cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval,
</span><span class="lines">@@ -103,6 +111,14 @@
</span><span class="cx"> WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
</span><span class="cx"> WebCore::pageCache()->setCapacity(pageCacheCapacity);
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (!m_usesNetworkProcess) {
+#endif
+ if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
+ soup_cache_set_max_size(cache, urlCacheDiskCapacity);
+#if ENABLE(NETWORK_PROCESS)
+ }
+#endif
</ins><span class="cx"> if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
</span><span class="cx"> soup_cache_set_max_size(cache, urlCacheDiskCapacity);
</span><span class="cx"> }
</span><span class="lines">@@ -112,6 +128,11 @@
</span><span class="cx"> if (cachesToClear == InMemoryResourceCachesOnly)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // If we're using the network process then it is the only one that needs to clear the disk cache.
+#if ENABLE(NETWORK_PROCESS)
+ if (m_usesNetworkProcess)
+ return;
+#endif
</ins><span class="cx"> SoupSession* session = WebCore::ResourceHandle::defaultSession();
</span><span class="cx"> soup_cache_clear(SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE)));
</span><span class="cx"> }
</span><span class="lines">@@ -177,11 +198,16 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ASSERT(!parameters.diskCacheDirectory.isEmpty());
- GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(parameters.diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
- soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
- soup_cache_load(soupCache.get());
-
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (!m_usesNetworkProcess) {
+#endif
+ ASSERT(!parameters.diskCacheDirectory.isEmpty());
+ GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(parameters.diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
+ soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
+ soup_cache_load(soupCache.get());
+#if ENABLE(NETWORK_PROCESS)
+ }
+#endif
</ins><span class="cx"> if (!parameters.languages.isEmpty())
</span><span class="cx"> setSoupSessionAcceptLanguage(parameters.languages);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>