# HG changeset patch # User tonyp # Date 1219376299 14400 # Node ID 2564c620fa42979e712d9b8b45ca897c98fd2f5c # Parent 1ee8caae33afefd2774fdf50ce6d198423f4a74d# Parent 387a62b4be60275e5b68ad6d58474244c89ac093 Merge diff -r 1ee8caae33af -r 2564c620fa42 agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java --- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java Thu Aug 21 23:36:31 2008 -0400 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java Thu Aug 21 23:38:19 2008 -0400 @@ -193,8 +193,12 @@ private static final double FACTOR = 1024*1024; private void printValMB(String title, long value) { - double mb = value / FACTOR; - System.out.println(alignment + title + value + " (" + mb + "MB)"); + if (value < 0) { + System.out.println(alignment + title + (value >>> 20) + " MB"); + } else { + double mb = value/FACTOR; + System.out.println(alignment + title + value + " (" + mb + "MB)"); + } } private void printValue(String title, long value) { diff -r 1ee8caae33af -r 2564c620fa42 make/jprt.config --- a/make/jprt.config Thu Aug 21 23:36:31 2008 -0400 +++ b/make/jprt.config Thu Aug 21 23:38:19 2008 -0400 @@ -77,9 +77,7 @@ # All jdk6 builds use SS11 compiler_name=SS11 else - # FIXUP: Change to SS12 once it has been validated. - #compiler_name=SS12 - compiler_name=SS11 + compiler_name=SS12 fi fi diff -r 1ee8caae33af -r 2564c620fa42 make/solaris/makefiles/sparcWorks.make --- a/make/solaris/makefiles/sparcWorks.make Thu Aug 21 23:36:31 2008 -0400 +++ b/make/solaris/makefiles/sparcWorks.make Thu Aug 21 23:38:19 2008 -0400 @@ -51,12 +51,9 @@ VALIDATED_COMPILER_REV := 5.8 VALIDATED_C_COMPILER_REV := 5.8 else - # FIXUP: Change to SS12 (5.9) once it has been validated. # Validated compiler for JDK7 is SS12 (5.9) - #VALIDATED_COMPILER_REV := 5.9 - #VALIDATED_C_COMPILER_REV := 5.9 - VALIDATED_COMPILER_REV := 5.8 - VALIDATED_C_COMPILER_REV := 5.8 + VALIDATED_COMPILER_REV := 5.9 + VALIDATED_C_COMPILER_REV := 5.9 endif # Warning messages about not using the above validated version diff -r 1ee8caae33af -r 2564c620fa42 src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp --- a/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp Thu Aug 21 23:36:31 2008 -0400 +++ b/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp Thu Aug 21 23:38:19 2008 -0400 @@ -229,7 +229,7 @@ HeapWord* first_card_start = _bsa->address_for_index(first_card_index); if (first_card_start < pre_top) { HeapWord* second_card_start = - _bsa->address_for_index(first_card_index + 1); + _bsa->inc_by_region_size(first_card_start); // Ensure enough room to fill with the smallest block second_card_start = MAX2(second_card_start, pre_top + AlignmentReserve); diff -r 1ee8caae33af -r 2564c620fa42 src/share/vm/memory/blockOffsetTable.hpp --- a/src/share/vm/memory/blockOffsetTable.hpp Thu Aug 21 23:36:31 2008 -0400 +++ b/src/share/vm/memory/blockOffsetTable.hpp Thu Aug 21 23:38:19 2008 -0400 @@ -199,6 +199,12 @@ // "index" in "_offset_array". HeapWord* address_for_index(size_t index) const; + // Return the address "p" incremented by the size of + // a region. This method does not align the address + // returned to the start of a region. It is a simple + // primitive. + HeapWord* inc_by_region_size(HeapWord* p) const { return p + N_words; } + // Shared space support void serialize(SerializeOopClosure* soc, HeapWord* start, HeapWord* end); }; diff -r 1ee8caae33af -r 2564c620fa42 src/share/vm/memory/compactingPermGenGen.cpp --- a/src/share/vm/memory/compactingPermGenGen.cpp Thu Aug 21 23:36:31 2008 -0400 +++ b/src/share/vm/memory/compactingPermGenGen.cpp Thu Aug 21 23:38:19 2008 -0400 @@ -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 diff -r 1ee8caae33af -r 2564c620fa42 src/share/vm/memory/compactingPermGenGen.hpp --- a/src/share/vm/memory/compactingPermGenGen.hpp Thu Aug 21 23:36:31 2008 -0400 +++ b/src/share/vm/memory/compactingPermGenGen.hpp Thu Aug 21 23:38:19 2008 -0400 @@ -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(); diff -r 1ee8caae33af -r 2564c620fa42 src/share/vm/runtime/globals.hpp --- a/src/share/vm/runtime/globals.hpp Thu Aug 21 23:36:31 2008 -0400 +++ b/src/share/vm/runtime/globals.hpp Thu Aug 21 23:38:19 2008 -0400 @@ -1470,7 +1470,7 @@ "CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence" \ " ratio") \ \ - product(bool, CMSPrecleanRefLists1, true, \ + product(bool, CMSPrecleanRefLists1, false, \ "Preclean ref lists during (initial) preclean phase") \ \ product(bool, CMSPrecleanRefLists2, false, \ diff -r 1ee8caae33af -r 2564c620fa42 src/share/vm/runtime/statSampler.cpp --- a/src/share/vm/runtime/statSampler.cpp Thu Aug 21 23:36:31 2008 -0400 +++ b/src/share/vm/runtime/statSampler.cpp Thu Aug 21 23:38:19 2008 -0400 @@ -217,6 +217,7 @@ "java.class.path", "java.endorsed.dirs", "java.ext.dirs", + "java.version", "java.home", NULL };