/hg/icedtea7: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Oct 25 07:35:21 PDT 2012
changeset d8cfcb34720f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d8cfcb34720f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 24 13:15:19 2012 +0100
Include release notes from latest releases and bump HotSpot used by Zero.
2012-10-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Add 2.1.3, 2.2.3 and 2.3.3
releases.
* hotspot.map: Update Zero to latest HotSpot
from the 2.1 branch.
changeset fd2db835b6b0 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fd2db835b6b0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Oct 25 15:33:23 2012 +0100
Use latest IcedTea7 HEAD.
2012-10-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(OPENJDK_VERSION): Bump to b09.
(CORBA_CHANGESET): Update to IcedTea7 forest 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.
(ICEDTEA_ENV): Use SYSTEM_ZLIB rather than USE_SYSTEM_ZLIB.
* hotspot.map: Update default to head of IcedTea7
forest HotSpot.
changeset d51e4b4fe8ab in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d51e4b4fe8ab
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Oct 25 15:35:14 2012 +0100
Merge
diffstat:
ChangeLog | 40 +++
Makefile.am | 43 ++-
NEWS | 106 ++++++++
configure.ac | 1 +
hotspot.map | 4 +-
patches/systemtap_gc.patch | 369 +++++++++++++++++++++++++++++++
tapset/hotspot_gc.stp.in | 534 +++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 1080 insertions(+), 17 deletions(-)
diffs (truncated from 1198 to 500 lines):
diff -r 67d42446bc25 -r d51e4b4fe8ab ChangeLog
--- a/ChangeLog Wed Sep 26 14:52:49 2012 +0100
+++ b/ChangeLog Thu Oct 25 15:35:14 2012 +0100
@@ -1,3 +1,43 @@
+2012-10-24 Lukas Berk <lberk at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patches/systemtap_gc.patch.
+ (EXTRA_DIST): Add tapset/hotspot_gc.stp.in.
+ (stamps/icedtea.stamp): Build tapset/hotspot_gc.stp.
+ (stamps/icedtea-debug.stamp): Likewise.
+ * configure.ac: Generate tapset/hotspot_gc.stp.
+ * patches/systemtap_gc.patch:
+ Add Garbage Collection dtrace/systemtap probes to hotspot.
+ * tapset/hotspot_gc.stp.in:
+ Systemtap tapset allowing use of GC probes more comfortablely.
+
+2012-10-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b09.
+ (CORBA_CHANGESET): Update to IcedTea7 forest 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.
+ (ICEDTEA_ENV): Use SYSTEM_ZLIB rather than USE_SYSTEM_ZLIB.
+ * hotspot.map: Update default to head of IcedTea7
+ forest HotSpot.
+
+2012-10-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * NEWS: Add 2.1.3, 2.2.3 and 2.3.3
+ releases.
+ * hotspot.map: Update Zero to latest HotSpot
+ from the 2.1 branch.
+
2012-09-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 67d42446bc25 -r d51e4b4fe8ab Makefile.am
--- a/Makefile.am Wed Sep 26 14:52:49 2012 +0100
+++ b/Makefile.am Thu Oct 25 15:35:14 2012 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b08
+OPENJDK_VERSION = b09
JDK_UPDATE_VERSION = 10
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 7b663d107703
-JAXP_CHANGESET = 5534e1a3b332
-JAXWS_CHANGESET = b75161fe3bd2
-JDK_CHANGESET = 1c47442c7584
-LANGTOOLS_CHANGESET = 1045d2bf8428
-OPENJDK_CHANGESET = fc2e81562d86
+CORBA_CHANGESET = 1285389d6969
+JAXP_CHANGESET = 8e9679984e79
+JAXWS_CHANGESET = bbd4ecb4bbcb
+JDK_CHANGESET = 6ced7fea7614
+LANGTOOLS_CHANGESET = 79e875e2dca3
+OPENJDK_CHANGESET = 0fa8b0b4ca26
-CORBA_SHA256SUM = 2c828476f2cfd1a9e3a5be7abf307c2087829ef6be626ae6b00f8c5eaf021760
-JAXP_SHA256SUM = e09f10dd7bac6ddd92016cf2397dea8a8b704dbfa0f27ca99f1a6de080412a7d
-JAXWS_SHA256SUM = b08dcd8f4796daab11b13417b036de4323bed79e8c790ad958a55a1a165f08b8
-JDK_SHA256SUM = f758775982b021f6e650d1092a9f5d9bd900311603207c2ff51eb99fd4b2b731
-LANGTOOLS_SHA256SUM = f3e06606db1725548d4b67ff7f1db4e07ed291a46ac99a3149df6e82bd508945
-OPENJDK_SHA256SUM = c107253e6ca56e07c65f7656a47ae04cd53a061de9b8a302552be44cc65d1394
+CORBA_SHA256SUM = 880683c950e833a792d4c36059af4f8a4a50dc8fb9d773831bd9cd4578f2f2f7
+JAXP_SHA256SUM = ead7718f52579c1c096ed7e853582b2622ad7e64afbf9d360eae6af55de58377
+JAXWS_SHA256SUM = 78d4e79dc8b08bfd5940f02990e9664c296242dfcef4b5e820f93744e98e7e2d
+JDK_SHA256SUM = f720f75748ed5f9c4084a55be9465922f6a943234351e20567308cbfa02f0eca
+LANGTOOLS_SHA256SUM = 42444bf6a314d1914013b826d8137d6edf9843c14011cec5a4761289d1846a3d
+OPENJDK_SHA256SUM = acab74106ee2670962b048cd4f1b7cfbb0f55340477cd625b7cb40c6bc99036c
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -286,7 +286,9 @@
endif
if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/systemtap.patch
+ICEDTEA_PATCHES += \
+ patches/systemtap.patch \
+ patches/systemtap_gc.patch
endif
if ENABLE_NSS
@@ -511,7 +513,7 @@
if USE_SYSTEM_ZLIB
ICEDTEA_ENV += \
- USE_SYSTEM_ZLIB="true" \
+ SYSTEM_ZLIB="true" \
ZLIB_LIBS="${ZLIB_LIBS}" \
ZLIB_CFLAGS="${ZLIB_CFLAGS}"
endif
@@ -760,6 +762,7 @@
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
+ tapset/hotspot_gc.stp.in \
scripts/jni_create_stap.c \
scripts/jni_desc \
rewriter/agpl-3.0.txt \
@@ -1726,11 +1729,16 @@
sed -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
> $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
@@ -1792,11 +1800,16 @@
sed -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
> $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
fi; \
cp $(abs_top_builddir)/tapset/jstack.stp \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
diff -r 67d42446bc25 -r d51e4b4fe8ab NEWS
--- a/NEWS Wed Sep 26 14:52:49 2012 +0100
+++ b/NEWS Thu Oct 25 15:35:14 2012 +0100
@@ -11,9 +11,115 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 2.4 (2012-XX-XX):
+
+New in release 2.3.3 (2012-10-17):
+
+* Security fixes
+ - S6631398, CVE-2012-3216: FilePermission improved path checking
+ - S7093490: adjust package access in rmiregistry
+ - S7143535, CVE-2012-5068: ScriptEngine corrected permissions
+ - S7158796, CVE-2012-5070: Tighten properties checking in EnvHelp
+ - S7158807: Revise stack management with volatile call sites
+ - S7163198, CVE-2012-5076: Tightened package accessibility
+ - S7167656, CVE-2012-5077: Multiple Seeders are being created
+ - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
+ - S7169887, CVE-2012-5074: Tightened package accessibility
+ - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
+ - S7172522, CVE-2012-5072: Improve DomainCombiner checking
+ - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
+ - S7189103, CVE-2012-5069: Executors needs to maintain state
+ - S7189490: More improvements to DomainCombiner checking
+ - S7189567, CVE-2012-5085: java net obselete protocol
+ - S7192975, CVE-2012-5071: Issue with JMX reflection
+ - S7195194, CVE-2012-5084: Better data validation for Swing
+ - S7195549, CVE-2012-5087: Better bean object persistence
+ - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
+ - S7195919, CVE-2012-5979: (sl) ServiceLoader can throw CCE without needing to create instance
+ - S7196190, CVE-2012-5088: Improve method of handling MethodHandles
+ - S7198296, CVE-2012-5089: Refactor classloader usage
+ - S7158800: Improve storage of symbol tables
+ - S7158801: Improve VM CompileOnly option
+ - S7158804: Improve config file parsing
+ - S7198606, CVE-2012-4416: Improve VM optimization
+* Bug fixes
+ - Remove merge artefact.
+ - Remove the Xp header and library checks.
* JamVM
- PR1155: Do not put version number in libjvm.so SONAME
+New in release 2.2.3 (2012-10-17):
+
+* Security fixes
+ - S6631398, CVE-2012-3216: FilePermission improved path checking
+ - S7093490: adjust package access in rmiregistry
+ - S7143535, CVE-2012-5068: ScriptEngine corrected permissions
+ - S7158796, CVE-2012-5070: Tighten properties checking in EnvHelp
+ - S7158807: Revise stack management with volatile call sites
+ - S7163198, CVE-2012-5076: Tightened package accessibility
+ - S7167656, CVE-2012-5077: Multiple Seeders are being created
+ - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
+ - S7169887, CVE-2012-5074: Tightened package accessibility
+ - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
+ - S7172522, CVE-2012-5072: Improve DomainCombiner checking
+ - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
+ - S7189103, CVE-2012-5069: Executors needs to maintain state
+ - S7189490: More improvements to DomainCombiner checking
+ - S7189567, CVE-2012-5085: java net obselete protocol
+ - S7192975, CVE-2012-5071: Issue with JMX reflection
+ - S7195194, CVE-2012-5084: Better data validation for Swing
+ - S7195549, CVE-2012-5087: Better bean object persistence
+ - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
+ - S7195919, CVE-2012-5979: (sl) ServiceLoader can throw CCE without needing to create instance
+ - S7196190, CVE-2012-5088: Improve method of handling MethodHandles
+ - S7198296, CVE-2012-5089: Refactor classloader usage
+ - S7158801: Improve VM CompileOnly option
+ - S7158804: Improve config file parsing
+ - S7198606, CVE-2012-4416: Improve VM optimization
+* Backports
+ - S7175845: "jar uf" changes file permissions unexpectedly
+ - S7177216: native2ascii changes file permissions of input file
+ - S7158800: Improve storage of symbol tables
+* Bug fixes
+ - Remove merge artefact.
+ - Remove the Xp header and library checks.
+
+New in release 2.1.3 (2012-10-17):
+
+* Security fixes
+ - S6631398, CVE-2012-3216: FilePermission improved path checking
+ - S7093490: adjust package access in rmiregistry
+ - S7143535, CVE-2012-5068: ScriptEngine corrected permissions
+ - S7158796, CVE-2012-5070: Tighten properties checking in EnvHelp
+ - S7158807: Revise stack management with volatile call sites
+ - S7163198, CVE-2012-5076: Tightened package accessibility
+ - S7167656, CVE-2012-5077: Multiple Seeders are being created
+ - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
+ - S7169887, CVE-2012-5074: Tightened package accessibility
+ - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
+ - S7172522, CVE-2012-5072: Improve DomainCombiner checking
+ - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
+ - S7189103, CVE-2012-5069: Executors needs to maintain state
+ - S7189490: More improvements to DomainCombiner checking
+ - S7189567, CVE-2012-5085: java net obselete protocol
+ - S7192975, CVE-2012-5071: Issue with JMX reflection
+ - S7195194, CVE-2012-5084: Better data validation for Swing
+ - S7195549, CVE-2012-5087: Better bean object persistence
+ - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
+ - S7195919, CVE-2012-5979: (sl) ServiceLoader can throw CCE without needing to create instance
+ - S7196190, CVE-2012-5088: Improve method of handling MethodHandles
+ - S7198296, CVE-2012-5089: Refactor classloader usage
+ - S7158801: Improve VM CompileOnly option
+ - S7158804: Improve config file parsing
+ - S7198606, CVE-2012-4416: Improve VM optimization
+* Backports
+ - S7175845: "jar uf" changes file permissions unexpectedly
+ - S7177216: native2ascii changes file permissions of input file
+ - S7106773: 512 bits RSA key cannot work with SHA384 and SHA512
+ - S7158800: Improve storage of symbol tables
+* Bug fixes
+ - Remove merge artefact.
+ - Remove the Xp header and library checks.
+
New in release 2.1.2 (2012-09-02):
* Security fixes
diff -r 67d42446bc25 -r d51e4b4fe8ab configure.ac
--- a/configure.ac Wed Sep 26 14:52:49 2012 +0100
+++ b/configure.ac Thu Oct 25 15:35:14 2012 +0100
@@ -305,6 +305,7 @@
AC_CONFIG_FILES([tapset/hotspot.stp])
AC_CONFIG_FILES([tapset/hotspot_jni.stp])
AC_CONFIG_FILES([tapset/jstack.stp])
+ AC_CONFIG_FILES([tapset/hotspot_gc.stp])
fi
dnl Check for libXtst headers and libraries.
diff -r 67d42446bc25 -r d51e4b4fe8ab hotspot.map
--- a/hotspot.map Wed Sep 26 14:52:49 2012 +0100
+++ b/hotspot.map Thu Oct 25 15:35:14 2012 +0100
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot ede14825dbfa 3862e81ac99c464fda6f53898129ddbd1d62af63b7fc3ea06d21c4c9691da72e
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot c159737dd826 c1e626ecf4e7118ac269923ef0b83f5f8d36b0e816b293197ffbf8dd5083fa8d
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 8bc1fb0ebec0 33ff16981245bd328bffb371fc323cd074453d22a77081afa0767d13e4a2b4ff
+zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot a456d0771ba0 09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0
diff -r 67d42446bc25 -r d51e4b4fe8ab patches/systemtap_gc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/systemtap_gc.patch Thu Oct 25 15:35:14 2012 +0100
@@ -0,0 +1,369 @@
+--- openjdk.orig/hotspot/src/share/vm/compiler/oopMap.cpp 2012-06-26 09:24:22.390325184 -0400
++++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2012-07-06 10:12:44.981413003 -0400
+@@ -33,9 +33,13 @@
+ #include "memory/resourceArea.hpp"
+ #include "runtime/frame.inline.hpp"
+ #include "runtime/signature.hpp"
++#include "utilities/dtrace.hpp"
+ #ifdef COMPILER1
+ #include "c1/c1_Defs.hpp"
+ #endif
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL1(provider, gc__collection__delete, *uintptr_t);
++#endif /* !USDT2 */
+
+ // OopMapStream
+
+@@ -677,6 +681,9 @@
+ " - Derived: " INTPTR_FORMAT " Base: " INTPTR_FORMAT " (Offset: %d)",
+ derived_loc, (address)*derived_loc, (address)base, offset);
+ }
++#ifndef USDT2
++ HS_DTRACE_PROBE1(hotspot, gc__collection__delete, entry);
++#endif /* !USDT2 */
+
+ // Delete entry
+ delete entry;
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2012-07-12 09:48:40.349999515 -0400
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2012-07-19 18:38:07.560757426 -0400
+@@ -53,11 +53,18 @@
+ #include "runtime/vmThread.hpp"
+ #include "services/management.hpp"
+ #include "services/memoryService.hpp"
++#include "utilities/dtrace.hpp"
+ #include "utilities/events.hpp"
+ #include "utilities/stack.inline.hpp"
+
+ #include <math.h>
+
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__ParallelCompact__clear, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__parallel__collect, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__move, *uintptr_t, *uintptr_t, *uintptr_t, *uintptr_t);
++#endif /* !USDT2 */
++
+ // All sizes are in HeapWords.
+ const size_t ParallelCompactData::Log2RegionSize = 9; // 512 words
+ const size_t ParallelCompactData::RegionSize = (size_t)1 << Log2RegionSize;
+@@ -433,6 +439,9 @@
+
+ void ParallelCompactData::clear()
+ {
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__ParallelCompact__clear, &_region_data, _region_data->data_location());
++#endif /* !USDT2 */
+ memset(_region_data, 0, _region_vspace->committed_size());
+ }
+
+@@ -1970,6 +1979,9 @@
+ "should be in vm thread");
+
+ ParallelScavengeHeap* heap = gc_heap();
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__parallel__collect, heap, heap->gc_cause());
++#endif /* !USDT2 */
+ GCCause::Cause gc_cause = heap->gc_cause();
+ assert(!heap->is_gc_active(), "not reentrant");
+
+@@ -3376,6 +3388,9 @@
+ // past the end of the partial object entering the region (if any).
+ HeapWord* const dest_addr = sd.partial_obj_end(dp_region);
+ HeapWord* const new_top = _space_info[space_id].new_top();
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__move, &beg_addr, &end_addr, &dest_addr, &new_top);
++#endif /* !USDT2 */
+ assert(new_top >= dest_addr, "bad new_top value");
+ const size_t words = pointer_delta(new_top, dest_addr);
+
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2012-08-15 12:04:43.837439833 -0400
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2012-08-15 12:01:47.897745719 -0400
+@@ -45,8 +45,13 @@
+ #include "runtime/thread.hpp"
+ #include "runtime/vmThread.hpp"
+ #include "utilities/copy.hpp"
++#include "utilities/dtrace.hpp"
+ #include "utilities/events.hpp"
+
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__G1__begin, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__G1__end, *uintptr_t, *uintptr_t);
++ #endif /* !USDT2 */
+ class HeapRegion;
+
+ void G1MarkSweep::invoke_at_safepoint(ReferenceProcessor* rp,
+@@ -84,6 +89,9 @@
+ // The marking doesn't preserve the marks of biased objects.
+ BiasedLocking::preserve_marks();
+
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__G1__begin, &sh, sh->gc_cause());
++#endif /* !USDT2 */
+ mark_sweep_phase1(marked_for_unloading, clear_all_softrefs);
+
+ mark_sweep_phase2();
+@@ -103,6 +111,9 @@
+ GenRemSet* rs = sh->rem_set();
+ rs->invalidate(sh->perm_gen()->used_region(), true /*whole_heap*/);
+
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__G1__end, &sh, sh->gc_cause());
++#endif /* !USDT2 */
+ // "free at last gc" is calculated from these.
+ // CHF: cheating for now!!!
+ // Universe::set_heap_capacity_at_last_gc(Universe::heap()->capacity());
+--- openjdk.orig/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2012-08-15 12:03:43.009543167 -0400
++++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2012-08-15 12:14:25.414381449 -0400
+@@ -33,6 +33,12 @@
+ #include "memory/tenuredGeneration.hpp"
+ #include "oops/oop.inline.hpp"
+ #include "runtime/java.hpp"
++#include "utilities/dtrace.hpp"
++
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__tenured__begin, bool, bool, size_t, bool);
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__tenured__end, bool, bool, size_t, bool);
++#endif /* !USDT2 */
+
+ TenuredGeneration::TenuredGeneration(ReservedSpace rs,
+ size_t initial_byte_size, int level,
+@@ -307,8 +313,14 @@
+ size_t size,
+ bool is_tlab) {
+ retire_alloc_buffers_before_full_gc();
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__tenured__begin, full, clear_all_soft_refs, size, is_tlab);
++#endif /* !USDT2 */
+ OneContigSpaceCardGeneration::collect(full, clear_all_soft_refs,
+ size, is_tlab);
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__tenured__end, full, clear_all_soft_refs, size, is_tlab);
++#endif /* !USDT2 */
+ }
+
+ void TenuredGeneration::update_gc_stats(int current_level,
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2012-08-15 12:03:43.039543116 -0400
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2012-08-15 12:18:57.181932342 -0400
+@@ -49,6 +49,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 )
+@@ -878,6 +884,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();
+ assert(gch->kind() == CollectedHeap::GenCollectedHeap,
+@@ -1032,6 +1041,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());
+--- openjdk.orig/hotspot/src/share/vm/memory/defNewGeneration.cpp 2012-08-15 12:03:43.010543164 -0400
++++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2012-08-15 12:21:41.076673646 -0400
+@@ -38,6 +38,7 @@
+ #include "oops/oop.inline.hpp"
+ #include "runtime/java.hpp"
+ #include "utilities/copy.hpp"
++#include "utilities/dtrace.hpp"
+ #include "utilities/stack.inline.hpp"
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "thread_linux.inline.hpp"
+@@ -51,7 +52,10 @@
+ #ifdef TARGET_OS_FAMILY_bsd
+ # include "thread_bsd.inline.hpp"
+ #endif
+-
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__defnew__begin, bool, bool, size_t, bool);
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__defnew__end, bool, bool, size_t, bool);
++#endif /* !USDT2 */
+ //
+ // DefNewGeneration functions.
+
+@@ -528,6 +532,9 @@
+ bool clear_all_soft_refs,
+ size_t size,
+ bool is_tlab) {
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__defnew__begin, full, clear_all_soft_refs, size, is_tlab);
++#endif /* !USDT2 */
+ assert(full || size > 0, "otherwise we don't want to collect");
More information about the distro-pkg-dev
mailing list