Reviewers: danno,
Description:
Merged r11740 into 3.9 branch.
Adjust Android heap sizes.
Original CL: https://chromiumcodereview.appspot.com/10541053
[email protected]
Please review this at https://chromiumcodereview.appspot.com/10536069/
SVN Base: https://v8.googlecode.com/svn/branches/3.9
Affected files:
M src/heap.cc
M src/version.cc
Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index
48e8b56762dfad7733eaa701597e59cb713202b6..e0116192cecaf3ab16d6f4b9f4d515ca1996ffd4
100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -67,21 +67,26 @@ Heap::Heap()
: 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_)
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
25769f244dc4284fc75a564f241692e7d1178d2d..f5fb39098a75f1b068b18bb2033e9af533b6da1f
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 9
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 29
+#define PATCH_LEVEL 30
// 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
