Revision: 11741
Author: [email protected]
Date: Fri Jun 8 06:33:37 2012
Log: Merged r11740 into 3.10 branch.
Adjust Android heap sizes.
Original CL: https://chromiumcodereview.appspot.com/10541053
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10544072
http://code.google.com/p/v8/source/detail?r=11741
Modified:
/branches/3.10/src/heap.cc
/branches/3.10/src/version.cc
=======================================
--- /branches/3.10/src/heap.cc Thu May 3 02:06:43 2012
+++ /branches/3.10/src/heap.cc Fri Jun 8 06:33:37 2012
@@ -66,21 +66,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.10/src/version.cc Tue Jun 5 01:06:18 2012
+++ /branches/3.10/src/version.cc Fri Jun 8 06:33:37 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 10
#define BUILD_NUMBER 8
-#define PATCH_LEVEL 13
+#define PATCH_LEVEL 14
// 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
