Revision: 11763
Author:   [email protected]
Date:     Mon Jun 11 09:27:12 2012
Log:      Merged r11740 into 3.8 branch.

Original CL: https://chromiumcodereview.appspot.com/10541053

Adjust Android heap sizes.

[email protected]

Review URL: https://chromiumcodereview.appspot.com/10542104
http://code.google.com/p/v8/source/detail?r=11763

Modified:
 /branches/3.8/src/heap.cc
 /branches/3.8/src/version.cc

=======================================
--- /branches/3.8/src/heap.cc   Thu Mar 22 08:27:47 2012
+++ /branches/3.8/src/heap.cc   Mon Jun 11 09:27:12 2012
@@ -68,21 +68,26 @@
     : isolate_(NULL),
// semispace_size_ should be a power of 2 and old_generation_size_ should be
 // a multiple of Page::kPageSize.
-#if defined(ANDROID)
-#define LUMP_OF_MEMORY (128 * KB)
-      code_range_size_(0),
-#elif defined(V8_TARGET_ARCH_X64)
+#if defined(V8_TARGET_ARCH_X64)
 #define LUMP_OF_MEMORY (2 * MB)
       code_range_size_(512*MB),
 #else
 #define LUMP_OF_MEMORY MB
       code_range_size_(0),
 #endif
+#if defined(ANDROID)
+      reserved_semispace_size_(4 * Max(LUMP_OF_MEMORY, Page::kPageSize)),
+      max_semispace_size_(4 * Max(LUMP_OF_MEMORY, Page::kPageSize)),
+      initial_semispace_size_(Page::kPageSize),
+      max_old_generation_size_(192*MB),
+      max_executable_size_(max_old_generation_size_),
+#else
       reserved_semispace_size_(8 * Max(LUMP_OF_MEMORY, Page::kPageSize)),
       max_semispace_size_(8 * Max(LUMP_OF_MEMORY, Page::kPageSize)),
       initial_semispace_size_(Page::kPageSize),
       max_old_generation_size_(700ul * LUMP_OF_MEMORY),
       max_executable_size_(256l * LUMP_OF_MEMORY),
+#endif

 // Variables set based on semispace_size_ and old_generation_size_ in
// ConfigureHeap (survived_since_last_expansion_, external_allocation_limit_)
=======================================
--- /branches/3.8/src/version.cc        Thu May 24 06:42:58 2012
+++ /branches/3.8/src/version.cc        Mon Jun 11 09:27:12 2012
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     8
 #define BUILD_NUMBER      9
-#define PATCH_LEVEL       23
+#define PATCH_LEVEL       24
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0

--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to