Set Android/V8 memory limits from dalvik.vm.heapsize.

base/sys_info_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_info.h"
 
 #include <limits>
 
 #include "base/file_util.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
+#if defined(OS_ANDROID)
+#include "base/android/dalvik_heap_size.h"
+#endif
 
 namespace base {
 
+#if defined(OS_ANDROID)
+static base::LazyInstance<android::DalvikHeapSize> g_dalvik_heap_size =

[darin (slow to review), 2012/05/16 23:55:03]

nit: shouldn't this be in a sys_info_android.cc file?

nit: why do you need LazyInstance?  it seems like you could also just let it
race at startup since it doesn't hurt to compute the Dalvik heap size twice.

int SysInfo::DalvikHeapSizeMB() {
  static int heap_size = GetDalvikHeapSizeMB();
  return heap_size;
}

If this lives in a file named sys_info_android.cc, then you could also just put
the GetDalvikHeapSizeMB() function implementation into an anonymous namespace
within this file.  No need for a class, etc.

[ulan, 2012/05/18 10:24:06]

Done.

I am not sure if __system_property_get is thread-safe or not. Its implementation
in bionic/libc/bionic/system_properties.c looks thread-safe. I will check with
Android NDK people to be sure.

+    LAZY_INSTANCE_INITIALIZER;
+
+int SysInfo::DalvikHeapSizeMB() {
+  return g_dalvik_heap_size.Get().HeapSizeMB();
+}
+#endif
+
 int64 SysInfo::AmountOfPhysicalMemory() {
   long pages = sysconf(_SC_PHYS_PAGES);
   long page_size = sysconf(_SC_PAGE_SIZE);
   if (pages == -1 || page_size == -1) {
     NOTREACHED();
     return 0;
   }
 
   return static_cast<int64>(pages) * page_size;
 }
@@ skipping 15 matching lines @@
       limit_valid = true;
     } else {
       NOTREACHED();
       return 0;
     }
   }
   return static_cast<size_t>(limit);
 }
 
 }  // namespace base