Mercurial > hg > release > icedtea7-2.6
changeset 2682:8a3e31a0cd56
Bump to u60b03 and include PR1653, PR1654 and PR1655.
2014-01-24 Andrew John Hughes <gnu.andrew@member.fsf.org>
Update to u60b03 and additional IcedTea fixes
PR1653, PR1654 and PR1655.
* Makefile.am:
(BUILD_VERSION): Bump to b03.
(CORBA_CHANGESET): Update to current HEAD.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated with changes.
* hotspot.map: Sync with forest HEAD.
* patches/boot/ecj-multicatch.patch:
Add new cases in RSAClientKeyExchange
and Handshaker.
* patches/systemtap_gc.patch: Regenerated.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Fri, 24 Jan 2014 20:37:05 +0000 |
parents | fb4939d4c208 |
children | aa96b9ba80e0 |
files | ChangeLog Makefile.am NEWS hotspot.map patches/boot/ecj-multicatch.patch patches/systemtap_gc.patch |
diffstat | 6 files changed, 187 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jan 22 12:36:12 2014 +0000 +++ b/ChangeLog Fri Jan 24 20:37:05 2014 +0000 @@ -1,3 +1,28 @@ +2014-01-24 Andrew John Hughes <gnu.andrew@member.fsf.org> + + Update to u60b03 and additional IcedTea fixes + PR1653, PR1654 and PR1655. + * Makefile.am: + (BUILD_VERSION): Bump to b03. + (CORBA_CHANGESET): Update to current HEAD. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated with changes. + * hotspot.map: Sync with forest HEAD. + * patches/boot/ecj-multicatch.patch: + Add new cases in RSAClientKeyExchange + and Handshaker. + * patches/systemtap_gc.patch: Regenerated. + 2014-01-22 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: Add 2.3.13 & 2.4.4 release notes.
--- a/Makefile.am Wed Jan 22 12:36:12 2014 +0000 +++ b/Makefile.am Fri Jan 24 20:37:05 2014 +0000 @@ -1,22 +1,22 @@ # Dependencies JDK_UPDATE_VERSION = 60 -BUILD_VERSION = b02 +BUILD_VERSION = b03 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 5ec8983b8223 -JAXP_CHANGESET = 2d65c7260575 -JAXWS_CHANGESET = bd85f1c0b8a1 -JDK_CHANGESET = 4c27cda21c4a -LANGTOOLS_CHANGESET = c271c79d6a8c -OPENJDK_CHANGESET = 77e89f3f9031 +CORBA_CHANGESET = 1d9647b1ff91 +JAXP_CHANGESET = 84cee724e1a8 +JAXWS_CHANGESET = a840edf95760 +JDK_CHANGESET = 3cc793e4b177 +LANGTOOLS_CHANGESET = c1b7eb1ea511 +OPENJDK_CHANGESET = 18745a6e5f6d -CORBA_SHA256SUM = 6c9a83e473ec409a59da9c04a578f7d0ad3322e5a938216eaa0e8d8d930eceb0 -JAXP_SHA256SUM = a8577172a84a44d108f036872adb18f2c06fdc59ae401161c9159f391ef9734a -JAXWS_SHA256SUM = b80f3c5319f2ff11bc8548c13711ffaf93de30ea5ca98468663e70fc7fbdd708 -JDK_SHA256SUM = b2c45af6da2815f85b80699e51de748924709d295e5b0d951a47bb94a4c808cd -LANGTOOLS_SHA256SUM = dccb8f490338b3d0808cb647acea48c60839145d61bd7cca6bc1fce42eba86ed -OPENJDK_SHA256SUM = 495d501b3f5769000bac4ca732b9a772c95a3ad0c3a390926d02302579351dc7 +CORBA_SHA256SUM = 8973eee61b625bf0fa43a369f1932385252a19154cf3e1870dd0cab34edfadf5 +JAXP_SHA256SUM = 44cf8572051bdae93f18a0a860e3f5b01a75a876f7fb5b0d97d5e96d7b1778ae +JAXWS_SHA256SUM = 328d8d964143d97a875dab4573071231b7d28286c2656242b39221358327965a +JDK_SHA256SUM = 229e9e20f8fd4d62be34ff20653f49b6defa021ff8e5c9841fb1fc2b0199d23b +LANGTOOLS_SHA256SUM = 7e3e82ef3fae40e7628f088dae8e3b51ab426419f3e548782fd43d6961c531d7 +OPENJDK_SHA256SUM = 834ed675c9382c95a639d1ec0c7a712ce2d9e83dbc0d2fa74fe686527f6d2582 CACAO_VERSION = e215e36be9fc CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
--- a/NEWS Wed Jan 22 12:36:12 2014 +0000 +++ b/NEWS Fri Jan 24 20:37:05 2014 +0000 @@ -31,6 +31,7 @@ - S7147084: (process) appA hangs when read output stream of appB which starts appC that runs forever - S7171591: getDefaultScopeID() in src/solaris/native/java/net/net_util_md.c should return a value - S7173464: Clipboard.getAvailableDataFlavors: Comparison method violates contract + - S7191817: -XX:+UseSerialGC -XX:+UseLargePages crashes with SIGFPE on MacOS X - S7197210: java/lang/invoke/CallSiteTest.java failing on armsflt. - S8003262: reverse translation required changes in xalan resource bundles - S8004032: [TEST_BUG] [macosx] There is no effect when double clicking on the Icon, after right clicking on the Icon and the Icon disappear @@ -41,6 +42,7 @@ - S8008118: (process) Possible null pointer dereference in jdk/src/solaris/native/java/lang/UNIXProcess_md.c - S8008733: Psr:perf:osb performance regression (18%) in wss_bodyenc - S8009213: sun/management/jdp/JdpTest.sh fails with exit code 1 + - S8011955: Lunar screen reader crashes intermittently in WindowsAccessBridge-32.DLL - S8012326: Deadlock occurs when Charset.availableCharsets() is called by several threads at the same time - S8012615: Realm.getRealmsList returns realms list in wrong - S8012925: [parfait] Missing return value in jdk/src/macosx/native/sun/awt/AWTEvent.m @@ -48,6 +50,7 @@ - S8015243: SchemaFactory does not catch enum. value that is not in the value space of the base type, anyURI - S8015599: [TEST_BUG] [macosx] Test closed/javax/swing/Popup/TaskbarPositionTest.java fails since JDK 8 b75 on MacOSX - S8015600: [TEST_BUG] [macosx] Test closed/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java fails since JDK 8 b75 on MacOSX + - S8015976: OpenJDK part of bug JDK-8015812 [TEST_BUG] Tests have conflicting test descriptions - S8016018: Typo in AbstractStringBuilder#indexOf and #lastIndexOf descriptions - S8016271: wsimport -clientjar does not create portable jars on Windows due to hardcoded backslash - S8016500: Unlocalized warnings. @@ -55,11 +58,15 @@ - S8017195: Introduce option to setKeepAlive parameter on CORBA sockets - S8019396: SA-JDI: OSThread class initialization throws an exception - S8021257: com.sun.corba.se.** should be on restricted package list + - S8021368: Launch of Java Web Start app fails with ClassCircularityError exception in 7u25 - S8021898: Broken JIT compiler optimization for loop unswitching - S8021943: FileDialog getFile returns corrupted string after previous setFile + - S8022213: Intermittent test failures in java/net/URLClassLoader - S8022507: SIGSEGV at ParMarkBitMap::verify_clear() - S8022584: Memory leak in some NetworkInterface methods - S8022585: VM crashes when ran with -XX:+PrintInlining + - S8022698: javax/script/GetInterfaceTest.java fails since 7u45 b04 with -agentvm option + - S8022868: missing codepage Cp290 at java runtime - S8022993: Convert MAX_UNROLL constant to LoopMaxUnroll C2 flag - S8023130: (process) ProcessBuilder#inheritIO does not work on Windows - S8023310: Thread contention in the method Beans.IsDesignTime() @@ -83,35 +90,71 @@ - S8025207: Intermittent test failure: javax/management/monitor/CounterMonitorThresholdTest.java - S8025255: (tz) Support tzdata2013g - S8025512: NPE with logging while launching webstart on jre7u40 if logging is disabled + - S8025679: Increment minor version of HSx for 7u51 and initialize the build number - S8025713: Syncing indendation/comment/copyright year differences with upstream projects + - S8025775: JNI warnings in TryXShmAttach - S8025860: new hotspot build - hs24.60-b02 - S8025861: Set minor version for hotspot in 7u60 to 60 and build number to b01 - S8025920: webrev.ksh does not provide any details about changes in zip files + - S8026037: [TESTBUG] sun/security/tools/jarsigner/warnings.sh test fails on Solaris - S8026293: Schedule part of G1 pre-barrier late + - S8026304: jarsigner output bad grammar + - S8026405: javax/xml/ws/clientjar/TestWsImport.java failing on JDK 8 nightly aurora test runs - S8026486: Significant slowdown due to transparent huge pages - S8026502: java/lang/invoke/MethodHandleConstants.java fails on all platforms - S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2) + - S8026887: Make issues due to failed large pages allocations easier to debug - S8027066: XMLDecoder in java 7 cannot properly deserialize object arrays - S8027172: new hotspot build - hs24.60-b03 + - S8027204: Revise the update of 8026204 and 8025758 + - S8027224: test regression - ClassNotFoundException + - S8027351: (ref) Private finalize method invoked in preference to protected superclass method + - S8027370: Support tzdata2013h + - S8027378: Two closed/javax/xml/8005432 fails with jdk7u51b04 - S8027426: String.toLowerCase incorrectly increases length, if string contains \u0130 char - S8027579: new hotspot build - hs24.60-b04 + - S8027787: 7u51 l10n resource file translation update 1 - S8027837: JDK-8021257 causes CORBA build failure on emdedded platforms - S8027839: C1 crashes in Weblogic with G1 enabled - S8027840: C2 allows safepoint checks to leak into G1 pre-barriers - S8027860: [TEST_BUG] File not closed in javax/xml/jaxp/parsers/8022548/XOMParserTest.java + - S8027943: serial version of com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl changed in 7u45 + - S8027944: Increment hsx 24.51 build to b02 for 7u51-b07 - S8027997: G1: SPECjbb2013 crashes due to a broken object reference - S8028054: com.sun.beans.finder.MethodFinder has unsynchronized access to a static Map + - S8028057: Modify jarsigner man page documentation to document CCC 8024302: Clarify jar verifications + - S8028090: reverting change - changeset pushed with incorrect commit message, linked to wrong issue + - S8028111: XML readers share the same entity expansion counter + - S8028208: (aio) Assertion in clearPendingIoMap when closing at around time file lock is acquired immediately (win) - S8028215: ORB.init fails with SecurityException if properties select the JDK default ORB + - S8028293: Check local configuration for actual ephemeral port range - S8028351: JWS doesn't get authenticated when using kerberos auth proxy + - S8028382: Two javax/xml/8005433 tests still fail after the fix JDK-8028147 - S8028412: AsyncGetCallTrace() is broken on x86 in JDK 7u40 + - S8028453: AsynchronousSocketChannel.connect() requires SocketPermission due to bind to local address (win) + - S8028520: JVM should not throw VerifyError when a private method overrides a final method + - S8028583: Add helper methods to test libraries + - S8028814: new hotspot build - hs24.60-b06 + - S8028823: java/net/Makefile tabs converted to spaces + - S8029038: Revise fix for XML readers share the same entity expansion counter - S8029304: JFR broken in 7u train for JDK Linux for ARM or OpenJDK + - S8029318: Native Windows ccache still reads DES tickets + - S8029366: ShouldNotReachHere error when creating an array with component type of void - S8029599: JVM crashes on solaris-i586 with -Xverify:all if stack overflow happens during recursive reflective call + - S8029842: Increment hsx 24.51 build to b03 for 7u51-b11 + - S8029903: Add a type safe alternative for working with counter based data + - S8030061: new hotspot build - hs24.60-b05 + - S8030070: Test java/io/File/CheckPermission.java fails due to unfinished recursion (java.lang.StackOverflowError) when JIT'ed code (-client,-server) is running + - S8031787: Remove fix JDK-8026887 from 7u60 * Bug fixes - Fix implicit function declarations - PR1617: Include defs.make in vm.make so zeroshark.make is included - Add Shark definitions from 8003868 - Drop compile_method argument removed in 7083786 from sharkCompiler.cpp - Remove binary files and unlicensed generated files + - PR1653: Support ppc64le via Zero + - PR1654: ppc32 needs a larger ThreadStackSize to build + - PR1655: Don't add IcedTea-Web jars to bootclasspath * JamVM - JVM_NewMultiArray: element class may be an array - jtreg test java/lang/reflect/Array/ExceedMaxDim
--- a/hotspot.map Wed Jan 22 12:36:12 2014 +0000 +++ b/hotspot.map Fri Jan 24 20:37:05 2014 +0000 @@ -1,3 +1,3 @@ # version url changeset sha256sum -default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 11e724b1a33d 68edff4b613f9013f6c4779e1712512d02fc24886a53a69f35fa7e9313fce58b +default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 7d60cc48fa88 8ebc6c2fd55f530b8fdac85be4f5fc60dc2af1c45ecd8abae29696de7e9a8c73 ppc http://hg.openjdk.java.net/ppc-aix-port/jdk7u/hotspot 3cc52fb61873 ca8ddf13a1195688835cb4f6941aa9ac32070e05b5856a906a8fb2e3a5f81ac9
--- a/patches/boot/ecj-multicatch.patch Wed Jan 22 12:36:12 2014 +0000 +++ b/patches/boot/ecj-multicatch.patch Fri Jan 24 20:37:05 2014 +0000 @@ -481,3 +481,51 @@ throw new Error(x); } return null; +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-01-16 00:34:01.264963408 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-01-16 00:35:24.562264096 +0000 +@@ -1051,8 +1051,7 @@ + KeyGenerator kg = JsseJce.getKeyGenerator(masterAlg); + kg.init(spec); + return kg.generateKey(); +- } catch (InvalidAlgorithmParameterException | +- NoSuchAlgorithmException iae) { ++ } catch (InvalidAlgorithmParameterException iae) { + // unlikely to happen, otherwise, must be a provider exception + // + // For RSA premaster secrets, do not signal a protocol error +@@ -1060,6 +1059,12 @@ + if (debug != null && Debug.isOn("handshake")) { + System.out.println("RSA master secret generation error:"); + iae.printStackTrace(System.out); ++ } ++ throw new ProviderException(iae); ++ } catch (NoSuchAlgorithmException iae) { ++ if (debug != null && Debug.isOn("handshake")) { ++ System.out.println("RSA master secret generation error:"); ++ iae.printStackTrace(System.out); + } + throw new ProviderException(iae); + } +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2014-01-16 00:34:14.005162368 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2014-01-16 00:36:09.446964834 +0000 +@@ -271,12 +271,17 @@ + kg.init(new TlsRsaPremasterSecretParameterSpec( + version.major, version.minor, encodedSecret), generator); + return kg.generateKey(); +- } catch (InvalidAlgorithmParameterException | +- NoSuchAlgorithmException iae) { ++ } catch (InvalidAlgorithmParameterException iae) { + // unlikely to happen, otherwise, must be a provider exception + if (debug != null && Debug.isOn("handshake")) { + System.out.println("RSA premaster secret generation error:"); + iae.printStackTrace(System.out); ++ } ++ throw new RuntimeException("Could not generate dummy secret", iae); ++ } catch (NoSuchAlgorithmException iae) { ++ if (debug != null && Debug.isOn("handshake")) { ++ System.out.println("RSA premaster secret generation error:"); ++ iae.printStackTrace(System.out); + } + throw new RuntimeException("Could not generate dummy secret", iae); + }
--- a/patches/systemtap_gc.patch Wed Jan 22 12:36:12 2014 +0000 +++ b/patches/systemtap_gc.patch Fri Jan 24 20:37:05 2014 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp openjdk/hotspot/src/share/vm/compiler/oopMap.cpp ---- openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2013-07-02 03:27:01.515655212 +0100 +--- openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2014-01-24 04:36:46.878006161 +0000 @@ -33,9 +33,13 @@ #include "memory/resourceArea.hpp" #include "runtime/frame.inline.hpp" @@ -26,8 +26,8 @@ // Delete entry delete entry; diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-07-02 03:27:01.527655402 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-01-24 04:36:46.878006161 +0000 @@ -59,6 +59,12 @@ #include "runtime/vmThread.hpp" #include "services/memoryService.hpp" @@ -56,8 +56,8 @@ void CMSCollector::collect(bool full, diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-07-02 03:27:01.527655402 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2014-01-24 04:36:46.878006161 +0000 @@ -50,8 +50,13 @@ #include "runtime/thread.hpp" #include "runtime/vmThread.hpp" @@ -92,9 +92,46 @@ // "free at last gc" is calculated from these. // CHF: cheating for now!!! // Universe::set_heap_capacity_at_last_gc(Universe::heap()->capacity()); +diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-01-24 04:36:46.878006161 +0000 +@@ -54,6 +54,12 @@ + #include "utilities/copy.hpp" + #include "utilities/globalDefinitions.hpp" + #include "utilities/workgroup.hpp" ++#include "utilities/dtrace.hpp" ++ ++#ifndef USDT2 ++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__parnew__begin, bool, bool, size_t, bool); ++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__parnew__end, bool, bool, size_t, bool); ++#endif /* !USDT2 */ + + #ifdef _MSC_VER + #pragma warning( push ) +@@ -919,6 +925,9 @@ + bool clear_all_soft_refs, + size_t size, + bool is_tlab) { ++#ifndef USDT2 ++ HS_DTRACE_PROBE4(hotspot, gc__collection__parnew__begin, full, clear_all_soft_refs, size, is_tlab); ++#endif /* !USDT2 */ + assert(full || size > 0, "otherwise we don't want to collect"); + + GenCollectedHeap* gch = GenCollectedHeap::heap(); +@@ -1070,6 +1079,10 @@ + gch->print_heap_change(gch_prev_used); + } + ++#ifndef USDT2 ++ HS_DTRACE_PROBE4(hotspot, gc__collection__parnew__end, full, clear_all_soft_refs, size, is_tlab); ++#endif /* !USDT2 */ ++ + if (PrintGCDetails && ParallelGCVerbose) { + TASKQUEUE_STATS_ONLY(thread_state_set.print_termination_stats()); + TASKQUEUE_STATS_ONLY(thread_state_set.print_taskqueue_stats()); diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-07-02 03:27:01.527655402 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2014-01-24 04:36:46.878006161 +0000 @@ -43,8 +43,14 @@ #include "runtime/java.hpp" #include "runtime/vmThread.hpp" @@ -110,7 +147,7 @@ PSYoungGen* ParallelScavengeHeap::_young_gen = NULL; PSOldGen* ParallelScavengeHeap::_old_gen = NULL; PSPermGen* ParallelScavengeHeap::_perm_gen = NULL; -@@ -816,7 +822,13 @@ +@@ -815,7 +821,13 @@ } VM_ParallelGCSystemGC op(gc_count, full_gc_count, cause); @@ -125,8 +162,8 @@ // This interface assumes that it's being called by the diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-07-02 03:28:20.476907895 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-01-24 04:36:46.878006161 +0000 @@ -58,11 +58,18 @@ #include "services/management.hpp" #include "services/memoryService.hpp" @@ -177,8 +214,8 @@ const size_t words = pointer_delta(new_top, dest_addr); diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-07-02 03:27:01.527655402 +0100 +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2014-01-24 04:36:46.878006161 +0000 @@ -55,8 +55,17 @@ #include "runtime/vmThread.hpp" #include "runtime/vm_operations.hpp" @@ -233,46 +270,9 @@ } } -diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-07-02 03:27:01.531655466 +0100 -@@ -54,6 +54,12 @@ - #include "utilities/copy.hpp" - #include "utilities/globalDefinitions.hpp" - #include "utilities/workgroup.hpp" -+#include "utilities/dtrace.hpp" -+ -+#ifndef USDT2 -+ HS_DTRACE_PROBE_DECL4(provider, gc__collection__parnew__begin, bool, bool, size_t, bool); -+ HS_DTRACE_PROBE_DECL4(provider, gc__collection__parnew__end, bool, bool, size_t, bool); -+#endif /* !USDT2 */ - - #ifdef _MSC_VER - #pragma warning( push ) -@@ -919,6 +925,9 @@ - bool clear_all_soft_refs, - size_t size, - bool is_tlab) { -+#ifndef USDT2 -+ HS_DTRACE_PROBE4(hotspot, gc__collection__parnew__begin, full, clear_all_soft_refs, size, is_tlab); -+#endif /* !USDT2 */ - assert(full || size > 0, "otherwise we don't want to collect"); - - GenCollectedHeap* gch = GenCollectedHeap::heap(); -@@ -1070,6 +1079,10 @@ - gch->print_heap_change(gch_prev_used); - } - -+#ifndef USDT2 -+ HS_DTRACE_PROBE4(hotspot, gc__collection__parnew__end, full, clear_all_soft_refs, size, is_tlab); -+#endif /* !USDT2 */ -+ - if (PrintGCDetails && ParallelGCVerbose) { - TASKQUEUE_STATS_ONLY(thread_state_set.print_termination_stats()); - TASKQUEUE_STATS_ONLY(thread_state_set.print_taskqueue_stats()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-07-02 03:27:01.531655466 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2014-01-24 04:36:46.882006220 +0000 @@ -42,6 +42,7 @@ #include "oops/oop.inline.hpp" #include "runtime/java.hpp" @@ -315,8 +315,8 @@ gc_tracer.report_tenuring_threshold(tenuring_threshold()); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/generation.cpp openjdk/hotspot/src/share/vm/memory/generation.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/generation.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2013-07-02 03:27:01.531655466 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/generation.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2014-01-24 04:37:16.862442615 +0000 @@ -41,8 +41,14 @@ #include "oops/oop.inline.hpp" #include "runtime/java.hpp" @@ -344,11 +344,11 @@ + HS_DTRACE_PROBE4(hotspot, gc__collection__contig__end, full, clear_all_soft_refs, size, is_tlab); +#endif /* !USDT2 */ - gc_timer->register_gc_end(os::elapsed_counter()); + gc_timer->register_gc_end(); diff -Nru openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp ---- openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-07-01 15:21:44.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2013-07-02 03:27:01.531655466 +0100 +--- openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2014-01-23 23:25:39.000000000 +0000 ++++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2014-01-24 04:36:46.882006220 +0000 @@ -33,6 +33,12 @@ #include "memory/tenuredGeneration.hpp" #include "oops/oop.inline.hpp"