[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ggaren at apple.com
ggaren at apple.com
Sun Feb 20 23:03:51 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 831b5d4ba51b4550d06e8046324721a9e0e14e3e
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 16 05:11:14 2011 +0000
2011-01-15 Geoffrey Garen <ggaren at apple.com>
Reviewed by Oliver Hunt.
Rolled back in r75886.
https://bugs.webkit.org/show_bug.cgi?id=52527
r75886 broke the GTK Linux bot because Linux was -- quite surprisingly --
set up to use the constants for embedded devices.
* jit/ExecutableAllocatorFixedVMPool.cpp:
(JSC::maybeModifyVMPoolSize): Separated Linux constants from embedded
constants.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75891 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index bbbc2bd..cab64b3 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-15 Geoffrey Garen <ggaren at apple.com>
+
+ Reviewed by Oliver Hunt.
+
+ Rolled back in r75886.
+ https://bugs.webkit.org/show_bug.cgi?id=52527
+
+ r75886 broke the GTK Linux bot because Linux was -- quite surprisingly --
+ set up to use the constants for embedded devices.
+
+ * jit/ExecutableAllocatorFixedVMPool.cpp:
+ (JSC::maybeModifyVMPoolSize): Separated Linux constants from embedded
+ constants.
+
2011-01-15 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r75886.
diff --git a/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
index 45d8297..dd711d4 100644
--- a/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
+++ b/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
@@ -42,10 +42,13 @@
#include <stdio.h>
#endif
-static const unsigned vmPoolSizeGeneric = 2u * 1024u * 1024u * 1024u; // 2Gb
-static const unsigned coalesceLimitGeneric = 16u * 1024u * 1024u; // 16Mb
+static const unsigned vmPoolSizeOvercommit = 2u * 1024u * 1024u * 1024u; // 2Gb
+static const unsigned coalesceLimitOvercommit = 16u * 1024u * 1024u; // 16Mb
-static const unsigned vmPoolSizeEmbedded = 32u * 1024u * 1024u; // 32Mb
+static const unsigned vmPoolSizeNoOvercommit = 32u * 1024u * 1024u; // 32Mb
+static const unsigned coalesceLimitNoOvercommit = 4u * 1024u * 1024u; // 4Mb
+
+static const unsigned vmPoolSizeEmbedded = 16u * 1024u * 1024u; // 16Mb
static const unsigned coalesceLimitEmbedded = 4u * 1024u * 1024u; // 4Mb
#if CPU(X86_64) && !OS(LINUX)
@@ -55,12 +58,14 @@ static const unsigned coalesceLimitEmbedded = 4u * 1024u * 1024u; // 4Mb
// distros commonly disable that feature. We'll check the value
// for the overcommit feature at runtime and re-assign the Generic
// values if it's enabled.
-static unsigned vmPoolSize = vmPoolSizeGeneric; // 2Gb
-static unsigned coalesceLimit = coalesceLimitGeneric; // 16Mb
+static unsigned vmPoolSize = vmPoolSizeOvercommit;
+static unsigned coalesceLimit = coalesceLimitOvercommit;
+#elif CPU(ARM)
+static unsigned vmPoolSize = vmPoolSizeEmbedded;
+static unsigned coalesceLimit = coalesceLimitEmbedded;
#else
- // These limits are hopefully sensible on embedded platforms.
-static unsigned vmPoolSize = vmPoolSizeEmbedded; // 32Mb
-static unsigned coalesceLimit = coalesceLimitEmbedded; // 4Mb
+static unsigned vmPoolSize = vmPoolSizeNoOvercommit;
+static unsigned coalesceLimit = coalesceLimitNoOvercommit;
#endif
using namespace WTF;
@@ -458,8 +463,8 @@ static void maybeModifyVMPoolSize()
unsigned overcommit = 0;
fscanf(fp, "%u", &overcommit);
if (overcommit == 1) {
- vmPoolSize = vmPoolSizeGeneric; // 2Gb
- coalesceLimit = coalesceLimitGeneric; // 16Mb
+ vmPoolSize = vmPoolSizeOvercommit;
+ coalesceLimit = coalesceLimitOvercommit;
}
fclose(fp);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list