Title: [184064] trunk/Source/WebKit2
- Revision
- 184064
- Author
- commit-qu...@webkit.org
- Date
- 2015-05-10 20:09:11 -0700 (Sun, 10 May 2015)
Log Message
[GTK][SOUP] Web and Network processes don't know how to get memory size on OSX
https://bugs.webkit.org/show_bug.cgi?id=144554
Patch by Philip Chimento <philip.chime...@gmail.com> on 2015-05-10
Reviewed by Darin Adler.
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::platformSetCacheModel): Use WTF::ramSize()
instead of local function. Also use WTF::MB instead of dividing by
1024 * 1024.
(WebKit::getMemorySize): Deleted.
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::WebProcess::platformSetCacheModel): Ditto.
(WebKit::getMemorySize): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (184063 => 184064)
--- trunk/Source/WebKit2/ChangeLog 2015-05-11 03:07:09 UTC (rev 184063)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-11 03:09:11 UTC (rev 184064)
@@ -1,3 +1,19 @@
+2015-05-10 Philip Chimento <philip.chime...@gmail.com>
+
+ [GTK][SOUP] Web and Network processes don't know how to get memory size on OSX
+ https://bugs.webkit.org/show_bug.cgi?id=144554
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::platformSetCacheModel): Use WTF::ramSize()
+ instead of local function. Also use WTF::MB instead of dividing by
+ 1024 * 1024.
+ (WebKit::getMemorySize): Deleted.
+ * WebProcess/soup/WebProcessSoup.cpp:
+ (WebKit::WebProcess::platformSetCacheModel): Ditto.
+ (WebKit::getMemorySize): Deleted.
+
2015-05-10 Yongjun Zhang <yongjun_zh...@apple.com>
Use preview view controller from WebKitSystemInterface.
Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (184063 => 184064)
--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-05-11 03:07:09 UTC (rev 184063)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-05-11 03:09:11 UTC (rev 184064)
@@ -38,6 +38,7 @@
#include <WebCore/ResourceHandle.h>
#include <WebCore/SoupNetworkSession.h>
#include <libsoup/soup.h>
+#include <wtf/RAMSize.h>
#include <wtf/gobject/GRefPtr.h>
#include <wtf/gobject/GUniquePtr.h>
@@ -59,20 +60,6 @@
}
#endif
-static uint64_t getMemorySize()
-{
- static uint64_t kDefaultMemorySize = 512;
- 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;
-}
-
void NetworkProcess::userPreferredLanguagesChanged(const Vector<String>& languages)
{
SoupNetworkSession::defaultSession().setAcceptLanguages(languages);
@@ -128,13 +115,13 @@
unsigned long urlCacheDiskCapacity = 0;
#if ENABLE(NETWORK_CACHE)
- uint64_t diskFreeSize = WebCore::getVolumeFreeSizeForPath(m_diskCacheDirectory.utf8().data()) / 1024 / 1024;
+ uint64_t diskFreeSize = WebCore::getVolumeFreeSizeForPath(m_diskCacheDirectory.utf8().data()) / WTF::MB;
#else
SoupCache* cache = SoupNetworkSession::defaultSession().cache();
- uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
+ uint64_t diskFreeSize = getCacheDiskFreeSize(cache) / WTF::MB;
#endif
- uint64_t memSize = getMemorySize();
+ uint64_t memSize = WTF::ramSize() / WTF::MB;
calculateCacheSizes(cacheModel, memSize, diskFreeSize,
cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval,
pageCacheCapacity, urlCacheMemoryCapacity, urlCacheDiskCapacity);
Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (184063 => 184064)
--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-05-11 03:07:09 UTC (rev 184063)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-05-11 03:09:11 UTC (rev 184064)
@@ -41,6 +41,7 @@
#include <WebCore/ResourceHandle.h>
#include <WebCore/SoupNetworkSession.h>
#include <libsoup/soup.h>
+#include <wtf/RAMSize.h>
#include <wtf/gobject/GRefPtr.h>
#include <wtf/gobject/GUniquePtr.h>
@@ -58,20 +59,6 @@
return WebCore::getVolumeFreeSizeForPath(cacheDir.get());
}
-static uint64_t getMemorySize()
-{
- static uint64_t kDefaultMemorySize = 512;
- long pageSize = sysconf(_SC_PAGESIZE);
- if (pageSize == -1)
- return kDefaultMemorySize;
-
- long physPages = sysconf(_SC_PHYS_PAGES);
- if (physPages == -1)
- return kDefaultMemorySize;
-
- return ((pageSize / 1024LL) * physPages) / 1024LL;
-}
-
void WebProcess::platformSetCacheModel(CacheModel cacheModel)
{
unsigned cacheTotalCapacity = 0;
@@ -88,10 +75,10 @@
if (!usesNetworkProcess()) {
cache = WebCore::SoupNetworkSession::defaultSession().cache();
- diskFreeSize = getCacheDiskFreeSize(cache) / 1024 / 1024;
+ diskFreeSize = getCacheDiskFreeSize(cache) / WTF::MB;
}
- uint64_t memSize = getMemorySize();
+ uint64_t memSize = WTF::ramSize() / WTF::MB;
calculateCacheSizes(cacheModel, memSize, diskFreeSize,
cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval,
pageCacheSize, urlCacheMemoryCapacity, urlCacheDiskCapacity);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
