Mercurial > hg > truffle
changeset 6736:11fb740ce98f
7196103: NPG: Unable to allocate bit map for parallel garbage collection for the requested heap size
Summary: Don't allocate huge class metaspace size by default on x64
Reviewed-by: stefank, jmasa, kvn
author | coleenp |
---|---|
date | Fri, 07 Sep 2012 16:42:25 -0400 |
parents | aed758eda82a |
children | 4bfe8b33cf66 |
files | src/share/vm/memory/metaspace.cpp src/share/vm/memory/universe.cpp src/share/vm/runtime/arguments.cpp src/share/vm/runtime/globals.hpp |
diffstat | 4 files changed, 24 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/memory/metaspace.cpp Fri Sep 07 12:04:16 2012 -0400 +++ b/src/share/vm/memory/metaspace.cpp Fri Sep 07 16:42:25 2012 -0400 @@ -2779,19 +2779,22 @@ _class_space_list = new VirtualSpaceList(rs); } -// Class space probably needs a lot less than data space -const int class_space_divisor = 4; void Metaspace::initialize(Mutex* lock, size_t initial_size) { - // Use SmallChunk size if not specified, adjust class to smaller size if so. + // Use SmallChunk size if not specified. If specified, use this size for + // the data metaspace. size_t word_size; size_t class_word_size; if (initial_size == 0) { word_size = (size_t) SpaceManager::SmallChunk; - class_word_size = word_size; + class_word_size = (size_t) SpaceManager::SmallChunk; } else { word_size = initial_size; - class_word_size = initial_size/class_space_divisor; + // Make the first class chunk bigger than a medium chunk so it's not put + // on the medium chunk list. The next chunk will be small and progress + // from there. This size calculated by -version. + class_word_size = MIN2((size_t)SpaceManager::MediumChunk*5, + (ClassMetaspaceSize/BytesPerWord)*2); } assert(space_list() != NULL,
--- a/src/share/vm/memory/universe.cpp Fri Sep 07 12:04:16 2012 -0400 +++ b/src/share/vm/memory/universe.cpp Fri Sep 07 16:42:25 2012 -0400 @@ -858,7 +858,7 @@ ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) { // Add in the class metaspace area so the classes in the headers can // be compressed the same as instances. - size_t total_reserved = heap_size + ClassMetaspaceSize; + size_t total_reserved = align_size_up(heap_size + ClassMetaspaceSize, alignment); char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop); ReservedHeapSpace total_rs(total_reserved, alignment, UseLargePages, addr);
--- a/src/share/vm/runtime/arguments.cpp Fri Sep 07 12:04:16 2012 -0400 +++ b/src/share/vm/runtime/arguments.cpp Fri Sep 07 16:42:25 2012 -0400 @@ -1427,6 +1427,16 @@ // if (FLAG_IS_DEFAULT(UseCompressedKlassPointers)) { // FLAG_SET_ERGO(bool, UseCompressedKlassPointers, true); // } + // Set the ClassMetaspaceSize to something that will not need to be + // expanded, since it cannot be expanded. + if (UseCompressedKlassPointers && FLAG_IS_DEFAULT(ClassMetaspaceSize)) { + // 100,000 classes seems like a good size, so 100M assumes around 1K + // per klass. The vtable and oopMap is embedded so we don't have a fixed + // size per klass. Eventually, this will be parameterized because it + // would also be useful to determine the optimal size of the + // systemDictionary. + FLAG_SET_ERGO(uintx, ClassMetaspaceSize, 100*M); + } } // Also checks that certain machines are slower with compressed oops // in vm_version initialization code. @@ -1965,6 +1975,9 @@ status = status && verify_object_alignment(); + status = status && verify_min_value(ClassMetaspaceSize, 1*M, + "ClassMetaspaceSize"); + return status; } @@ -2916,7 +2929,7 @@ (UseLargePages && FLAG_IS_CMDLINE(UseLargePages)); if (cannot_share) { if (must_share) { - warning("disabling large pages%s" + warning("disabling large pages %s" "because of %s", "" LP64_ONLY("and compressed oops "), DumpSharedSpaces ? "-Xshare:dump" : "-Xshare:on"); FLAG_SET_CMDLINE(bool, UseLargePages, false);
--- a/src/share/vm/runtime/globals.hpp Fri Sep 07 12:04:16 2012 -0400 +++ b/src/share/vm/runtime/globals.hpp Fri Sep 07 16:42:25 2012 -0400 @@ -2993,7 +2993,7 @@ product(uintx, MaxMetaspaceSize, max_uintx, \ "Maximum size of Metaspaces (in bytes)") \ \ - product(uintx, ClassMetaspaceSize, NOT_LP64(1*M) LP64_ONLY(512*M), \ + product(uintx, ClassMetaspaceSize, 2*M, \ "Maximum size of InstanceKlass area in Metaspace used for " \ "UseCompressedKlassPointers") \ \