Mercurial > hg > truffle
changeset 291:5251a9cd8eb8 jdk7-b34
6742207: jdk7 32-bit windows build failed running pack200
Summary: 6730514 inadvertently disabled perm gen expansion; reenable
Reviewed-by: ysr
| author | jcoomes |
|---|---|
| date | Wed, 27 Aug 2008 15:41:58 -0700 |
| parents | 9f7cf8db35b8 |
| children | 5967ae2171f6 |
| files | src/share/vm/memory/compactingPermGenGen.cpp src/share/vm/memory/compactingPermGenGen.hpp |
| diffstat | 2 files changed, 0 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/memory/compactingPermGenGen.cpp Wed Aug 20 20:24:00 2008 -0700 +++ b/src/share/vm/memory/compactingPermGenGen.cpp Wed Aug 27 15:41:58 2008 -0700 @@ -421,30 +421,6 @@ } - -bool CompactingPermGenGen::grow_by(size_t bytes) { - // Don't allow _virtual_size to expand into shared spaces. - size_t max_bytes = _virtual_space.uncommitted_size() - _shared_space_size; - if (bytes > _shared_space_size) { - bytes = _shared_space_size; - } - return OneContigSpaceCardGeneration::grow_by(bytes); -} - - -bool CompactingPermGenGen::grow_to_reserved() { - // Don't allow _virtual_size to expand into shared spaces. - bool success = false; - if (_virtual_space.uncommitted_size() > _shared_space_size) { - size_t remaining_bytes = - _virtual_space.uncommitted_size() - _shared_space_size; - success = OneContigSpaceCardGeneration::grow_by(remaining_bytes); - DEBUG_ONLY(if (!success) warning("grow to reserved failed");) - } - return success; -} - - // No young generation references, clear this generation's main space's // card table entries. Do NOT clear the card table entries for the // read-only space (always clear) or the read-write space (valuable
--- a/src/share/vm/memory/compactingPermGenGen.hpp Wed Aug 20 20:24:00 2008 -0700 +++ b/src/share/vm/memory/compactingPermGenGen.hpp Wed Aug 27 15:41:58 2008 -0700 @@ -183,8 +183,6 @@ void compact(); void post_compact(); size_t contiguous_available() const; - bool grow_by(size_t bytes); - virtual bool grow_to_reserved(); void clear_remembered_set(); void invalidate_remembered_set();