Changeset 75891 in webkit

Timestamp:

Jan 15, 2011 9:11:14 PM (13 years ago)

Author:

ggaren@apple.com

Message:

2011-01-15 Geoffrey Garen <​ggaren@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.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/ExecutableAllocatorFixedVMPool.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-15  Geoffrey Garen  <ggaren@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@gmail.com>
 

trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

@@ -43 +43 @@
 #endif
 
-static const unsigned vmPoolSizeGeneric = 2u * 1024u * 1024u * 1024u; // 2Gb
-static const unsigned coalesceLimitGeneric = 16u * 1024u * 1024u; // 16Mb
-
-static const unsigned vmPoolSizeEmbedded = 32u * 1024u * 1024u; // 32Mb
+static const unsigned vmPoolSizeOvercommit = 2u * 1024u * 1024u * 1024u; // 2Gb
+static const unsigned coalesceLimitOvercommit = 16u * 1024u * 1024u; // 16Mb
+
+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
 
@@ -56 +59 @@
 // 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
 
@@ -459 +464 @@
     fscanf(fp, "%u", &overcommit);
     if (overcommit == 1) {
-        vmPoolSize = vmPoolSizeGeneric; // 2Gb
-        coalesceLimit = coalesceLimitGeneric; // 16Mb
+        vmPoolSize = vmPoolSizeOvercommit;
+        coalesceLimit = coalesceLimitOvercommit;
     }