hg: jdk/submit: 2 new changesets

[paul.hohensee at gmail.com]

Changeset: a6f119156ee4
Author:    phh
Date:      2018-07-06 13:54 -0700
URL:       http://hg.openjdk.java.net/jdk/submit/rev/a6f119156ee4

Merge

- src/java.base/share/classes/sun/net/NetworkServer.java
- src/java.base/share/classes/sun/net/URLCanonicalizer.java
- test/jdk/java/lang/System/SetProperties.java
- test/langtools/tools/javac/6558548/T6558548_6.out
- test/langtools/tools/javac/8013179/T8013179.java
- test/langtools/tools/javac/8013179/T8013179.out
- test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel1_6.out
- test/langtools/tools/javac/StringsInSwitch/BadlyTypedLabel2_6.out
- test/langtools/tools/javac/StringsInSwitch/NonConstantLabel6.out
- test/langtools/tools/javac/StringsInSwitch/OneCaseSwitches.out
- test/langtools/tools/javac/StringsInSwitch/RSCL1_6.out
- test/langtools/tools/javac/StringsInSwitch/RSCL2_6.out
- test/langtools/tools/javac/TryWithResources/BadTwr6.out
- test/langtools/tools/javac/TryWithResources/BadTwrSyntax6.out
- test/langtools/tools/javac/TryWithResources/PlainTry6.out
- test/langtools/tools/javac/TryWithResources/TwrOnNonResource6.out
- test/langtools/tools/javac/annotations/repeatingAnnotations/WrongVersion6.out
- test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotationVersion.out
- test/langtools/tools/javac/defaultMethods/static/StaticInvokeQualified6.out
- test/langtools/tools/javac/defaultMethods/static/StaticInvokeSimple6.out
- test/langtools/tools/javac/literals/BadBinaryLiterals.6.out
- test/langtools/tools/javac/literals/BadUnderscoreLiterals.6.out
- test/langtools/tools/javac/types/CastObjectToPrimitiveTest.out

Changeset: bcfd45d39cc2
Author:    phh
Date:      2018-07-06 14:21 -0700
URL:       http://hg.openjdk.java.net/jdk/submit/rev/bcfd45d39cc2

8196989: Revamp G1 JMX MemoryPoolMXBeanm, GarbageCollectorMXBean, and jstat counter definitions
Summary: Add: humongous and archive memory pools; pure young and mixed collectors; corresponding jstat counters

! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
! src/hotspot/share/gc/g1/g1MemoryPool.cpp
! src/hotspot/share/gc/g1/g1MemoryPool.hpp
! src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
! src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
! src/hotspot/share/gc/g1/g1_globals.hpp
! src/hotspot/share/gc/g1/heapRegionSet.hpp
! src/hotspot/share/gc/g1/vmStructs_g1.hpp
! src/hotspot/share/services/memoryManager.cpp
! src/hotspot/share/services/memoryService.hpp
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1MonitoringSupport.java
! src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
! src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
! test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java
! test/hotspot/jtreg/gc/arguments/GCTypes.java
! test/hotspot/jtreg/gc/g1/mixedgc/TestOldGenCollectionUsage.java
! test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithG1.java
! test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithParallel.java
! test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithSerial.java
! test/hotspot/jtreg/gc/survivorAlignment/SurvivorAlignmentTestMain.java
! test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java
! test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java
! test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCauseResults.java
! test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcNewResults.java
! test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcResults.java
! test/jdk/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java
! test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest.java
! test/jdk/java/lang/management/MemoryMXBean/MemoryManagement.java
! test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
! test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh
! test/jdk/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java
! test/jdk/jdk/jfr/event/gc/detailed/PromotionEvent.java
! test/jdk/jdk/jfr/event/gc/stacktrace/AllocationStackTrace.java
! test/jdk/sun/tools/jstat/fileURITest1.awk
! test/jdk/sun/tools/jstat/gcCapacityOutput1.awk
! test/jdk/sun/tools/jstat/gcCauseOutput1.awk
! test/jdk/sun/tools/jstat/gcMetaCapacityOutput1.awk
! test/jdk/sun/tools/jstat/gcNewCapacityOutput1.awk
! test/jdk/sun/tools/jstat/gcNewOutput1.awk
! test/jdk/sun/tools/jstat/gcOldCapacityOutput1.awk
! test/jdk/sun/tools/jstat/gcOldOutput1.awk
! test/jdk/sun/tools/jstat/gcOutput1.awk
! test/jdk/sun/tools/jstat/jstatGcCapacityOutput1.sh
! test/jdk/sun/tools/jstat/jstatGcCauseOutput1.sh
! test/jdk/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh
! test/jdk/sun/tools/jstat/jstatGcNewCapacityOutput1.sh
! test/jdk/sun/tools/jstat/jstatGcNewOutput1.sh
! test/jdk/sun/tools/jstat/jstatGcOldCapacityOutput1.sh
! test/jdk/sun/tools/jstat/jstatGcOldOutput1.sh
! test/jdk/sun/tools/jstat/jstatGcOutput1.sh
! test/jdk/sun/tools/jstat/jstatLineCounts1.sh
! test/jdk/sun/tools/jstat/jstatLineCounts2.sh
! test/jdk/sun/tools/jstat/jstatLineCounts3.sh
! test/jdk/sun/tools/jstat/jstatLineCounts4.sh
! test/jdk/sun/tools/jstat/jstatTimeStamp1.sh
! test/jdk/sun/tools/jstat/lineCounts1.awk
! test/jdk/sun/tools/jstat/lineCounts2.awk
! test/jdk/sun/tools/jstat/lineCounts3.awk
! test/jdk/sun/tools/jstat/lineCounts4.awk
! test/jdk/sun/tools/jstat/timeStamp1.awk
! test/jdk/sun/tools/jstatd/JstatGCUtilParser.java
! test/lib/jdk/test/lib/jfr/GCHelper.java