commit f8aed38fd66b14ca31638362050cbfaa64f6135e
author Jeff Hao <jeffhao@google.com> Tue Sep 09 20:13:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 09 20:13:25 2014 +0000
tree fd4379a0b1757939eed6634711fdd97066277f05
parent 3298611e205a299612f2e403bfaeb955ec0a2bdd
parent 1ae33d6839a0e14a7e37bf9b88896479e30282d2

Merge "Change 099-vmdebug test to use File.createTempFile." into lmp-dev

runtime/gc/heap.h

diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index d3d613f..7304887 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -129,8 +129,12 @@
   // If true, measure the total allocation time.
   static constexpr bool kMeasureAllocationTime = false;
   // Primitive arrays larger than this size are put in the large object space.
+#ifdef __LP64__
+  // Temporarily disable LOS on 64 bit until MAP_32BIT performance issues are fixed. b/17414549
+  static constexpr size_t kDefaultLargeObjectThreshold = 0xFFFFFFFFU;
+#else
   static constexpr size_t kDefaultLargeObjectThreshold = 3 * kPageSize;
-
+#endif
   static constexpr size_t kDefaultStartingSize = kPageSize;
   static constexpr size_t kDefaultInitialSize = 2 * MB;
   static constexpr size_t kDefaultMaximumSize = 256 * MB;