/hg/release/icedtea7-2.4: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Mar 27 20:02:15 UTC 2014
changeset 7e432bfdb372 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=7e432bfdb372
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 19:18:54 2014 +0000
PR1713: Support AArch64 port
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/boot/hotspot/default/jdk-dependency.patch:
Moved to...
* patches/boot/hotspot/zero/jdk-dependency.patch:
Removed; no longer a zero HotSpot build.
* Makefile.am:
(ICEDTEA_BOOT_PATCHES): Make jdk-dependency not
dependent on HotSpot version.
* patches/boot/hotspot-jdk-dependency.patch:
...here.
2014-03-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/systemtap_gc.patch: Moved to...
* Makefile.am:
(ICEDTEA_PATCHES): Make systemtap_gc.patch
HotSpot-dependent.
* hotspot.map: Add aarch64 HotSpot.
* patches/hotspot/aarch64/systemtap_gc.patch:
New patch against AArch64 HotSpot tarball.
* patches/hotspot/default/systemtap_gc.patch:
... here.
changeset 2b651084f99e in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=2b651084f99e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 20:01:40 2014 +0000
PR1713: Support AArch64 port
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Default to off on aarch64/arm64.
(IT_WITH_HOTSPOT_BUILD): Default to aarch64 port on aarch64.
diffstat:
ChangeLog | 30 +
Makefile.am | 4 +-
acinclude.m4 | 8 +-
hotspot.map | 1 +
patches/boot/hotspot-jdk-dependency.patch | 23 +
patches/boot/hotspot/default/jdk-dependency.patch | 23 -
patches/boot/hotspot/zero/jdk-dependency.patch | 25 -
patches/hotspot/aarch64/systemtap_gc.patch | 373 +++++++++++++++++++++
patches/hotspot/default/systemtap_gc.patch | 379 ++++++++++++++++++++++
patches/systemtap_gc.patch | 379 ----------------------
10 files changed, 815 insertions(+), 430 deletions(-)
diffs (truncated from 1316 to 500 lines):
diff -r b9722cf65cbe -r 2b651084f99e ChangeLog
--- a/ChangeLog Wed Mar 26 20:58:00 2014 +0000
+++ b/ChangeLog Thu Mar 27 20:01:40 2014 +0000
@@ -1,3 +1,33 @@
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_ENABLE_ZERO_BUILD): Default to off on aarch64/arm64.
+ (IT_WITH_HOTSPOT_BUILD): Default to aarch64 port on aarch64.
+
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/boot/hotspot/default/jdk-dependency.patch:
+ Moved to...
+ * patches/boot/hotspot/zero/jdk-dependency.patch:
+ Removed; no longer a zero HotSpot build.
+ * Makefile.am:
+ (ICEDTEA_BOOT_PATCHES): Make jdk-dependency not
+ dependent on HotSpot version.
+ * patches/boot/hotspot-jdk-dependency.patch:
+ ...here.
+
+2014-03-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/systemtap_gc.patch: Moved to...
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Make systemtap_gc.patch
+ HotSpot-dependent.
+ * hotspot.map: Add aarch64 HotSpot.
+ * patches/hotspot/aarch64/systemtap_gc.patch:
+ New patch against AArch64 HotSpot tarball.
+ * patches/hotspot/default/systemtap_gc.patch:
+ ... here.
+
2014-03-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r b9722cf65cbe -r 2b651084f99e Makefile.am
--- a/Makefile.am Wed Mar 26 20:58:00 2014 +0000
+++ b/Makefile.am Thu Mar 27 20:01:40 2014 +0000
@@ -290,7 +290,7 @@
if ENABLE_SYSTEMTAP
ICEDTEA_PATCHES += \
- patches/systemtap_gc.patch
+ patches/hotspot/$(HSBUILD)/systemtap_gc.patch
endif
if ENABLE_NSS
@@ -328,7 +328,7 @@
patches/boot/corba-dependencies.patch \
patches/boot/jaxws-langtools-dependency.patch \
patches/boot/jaxws-jdk-dependency.patch \
- patches/boot/hotspot/${HSBUILD}/jdk-dependency.patch \
+ patches/boot/hotspot-jdk-dependency.patch \
patches/boot/ecj-multicatch.patch \
patches/boot/ecj-trywithresources.patch \
patches/boot/ecj-autoboxing.patch \
diff -r b9722cf65cbe -r 2b651084f99e acinclude.m4
--- a/acinclude.m4 Wed Mar 26 20:58:00 2014 +0000
+++ b/acinclude.m4 Thu Mar 27 20:01:40 2014 +0000
@@ -682,6 +682,8 @@
use_zero=yes;
else
case "${host}" in
+ aarch64-*-*) ;;
+ arm64-*-*) ;;
i?86-*-*) ;;
sparc*-*-*) ;;
x86_64-*-*) ;;
@@ -950,7 +952,11 @@
AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
[
AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
- DEFAULT_BUILD="default"
+ if test "x$JRE_ARCH_DIR" = "xaarch64"; then
+ DEFAULT_BUILD="aarch64"
+ else
+ DEFAULT_BUILD="default"
+ fi
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build=BUILD,the HotSpot build to use [[BUILD=default]])],
diff -r b9722cf65cbe -r 2b651084f99e hotspot.map
--- a/hotspot.map Wed Mar 26 20:58:00 2014 +0000
+++ b/hotspot.map Thu Mar 27 20:01:40 2014 +0000
@@ -1,2 +1,3 @@
# version url changeset sha256sum
default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 00478c5bf5e9 9f77cd372778c8a3359f3c9c0eb37c1dbd7c1f569613da89de64b41de48a5760
+aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot 22910135cca6 477cd13f7fbe34d6dd878bbdb1e16f73b4b22e0e78d049d98f3c9cce8c193a1a
diff -r b9722cf65cbe -r 2b651084f99e patches/boot/hotspot-jdk-dependency.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/hotspot-jdk-dependency.patch Thu Mar 27 20:01:40 2014 +0000
@@ -0,0 +1,23 @@
+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
+--- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:15:04.747642641 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:16:32.825095823 +0100
+@@ -91,7 +91,7 @@
+ # are in AGENT_FILES, so use the shell to expand them.
+ # Be extra carefull to not produce too long command lines in the shell!
+ $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+ $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
+diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
+--- openjdk-boot.orig/make/hotspot-rules.gmk 2012-05-23 20:37:39.000000000 +0100
++++ openjdk-boot/make/hotspot-rules.gmk 2012-05-23 22:16:52.425419199 +0100
+@@ -85,6 +85,7 @@
+ HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
+ HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
++HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
+
+ # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
+ # Or is there something wrong with hotspot/make/Makefile?
diff -r b9722cf65cbe -r 2b651084f99e patches/boot/hotspot/default/jdk-dependency.patch
--- a/patches/boot/hotspot/default/jdk-dependency.patch Wed Mar 26 20:58:00 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:15:04.747642641 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:16:32.825095823 +0100
-@@ -91,7 +91,7 @@
- # are in AGENT_FILES, so use the shell to expand them.
- # Be extra carefull to not produce too long command lines in the shell!
- $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
-diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
---- openjdk-boot.orig/make/hotspot-rules.gmk 2012-05-23 20:37:39.000000000 +0100
-+++ openjdk-boot/make/hotspot-rules.gmk 2012-05-23 22:16:52.425419199 +0100
-@@ -85,6 +85,7 @@
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
- HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
-
- # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
- # Or is there something wrong with hotspot/make/Makefile?
diff -r b9722cf65cbe -r 2b651084f99e patches/boot/hotspot/zero/jdk-dependency.patch
--- a/patches/boot/hotspot/zero/jdk-dependency.patch Wed Mar 26 20:58:00 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-07-20 18:05:26.733484117 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-07-20 18:10:11.384736044 +0100
-@@ -97,8 +97,8 @@
- $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
- $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
-
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
-diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
---- openjdk-boot.orig/make/hotspot-rules.gmk 2012-06-29 15:19:51.000000000 +0100
-+++ openjdk-boot/make/hotspot-rules.gmk 2012-07-20 18:10:28.277161702 +0100
-@@ -85,6 +85,7 @@
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
- HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
-
- # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
- # Or is there something wrong with hotspot/make/Makefile?
diff -r b9722cf65cbe -r 2b651084f99e patches/hotspot/aarch64/systemtap_gc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/aarch64/systemtap_gc.patch Thu Mar 27 20:01:40 2014 +0000
@@ -0,0 +1,373 @@
+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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp 2014-03-07 04:29:33.230530073 +0000
+@@ -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;
+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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-03-07 04:29:33.234530133 +0000
+@@ -62,6 +62,12 @@
+ #include "runtime/vmThread.hpp"
+ #include "services/memoryService.hpp"
+ #include "services/runtimeService.hpp"
++#include "utilities/dtrace.hpp"
++
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__contig__begin, bool, bool, size_t, bool);
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__contig__end, bool, bool, size_t, bool);
++#endif /* !USDT2 */
+
+ // statics
+ CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL;
+@@ -1642,7 +1648,13 @@
+ size_t size,
+ bool tlab)
+ {
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__contig__begin, full, clear_all_soft_refs, size, tlab);
++#endif /* !USDT2 */
+ collector()->collect(full, clear_all_soft_refs, size, tlab);
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__contig__end, full, clear_all_soft_refs, size, tlab);
++#endif /* !USDT2 */
+ }
+
+ 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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2014-03-07 04:33:00.601620772 +0000
+@@ -49,8 +49,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();
+@@ -99,6 +107,9 @@
+ BiasedLocking::restore_marks();
+ GenMarkSweep::deallocate_stacks();
+
++#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());
+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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2014-03-07 04:31:58.396693660 +0000
+@@ -43,8 +43,14 @@
+ #include "runtime/java.hpp"
+ #include "runtime/vmThread.hpp"
+ #include "services/memTracker.hpp"
++#include "utilities/dtrace.hpp"
+ #include "utilities/vmError.hpp"
+
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__parscavenge__heap__begin, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__parscavenge__heap__end, *uintptr_t, *uintptr_t);
++#endif /* !USDT2 */
++
+ PSYoungGen* ParallelScavengeHeap::_young_gen = NULL;
+ PSOldGen* ParallelScavengeHeap::_old_gen = NULL;
+ PSAdaptiveSizePolicy* ParallelScavengeHeap::_size_policy = NULL;
+@@ -530,7 +536,13 @@
+ }
+
+ VM_ParallelGCSystemGC op(gc_count, full_gc_count, cause);
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__parscavenge__heap__begin, &op, cause);
++#endif /* !USDT2 */
+ VMThread::execute(&op);
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__parscavenge__heap__end, &op, cause);
++#endif /* !USDT2 */
+ }
+
+ void ParallelScavengeHeap::oop_iterate(ExtendedOopClosure* cl) {
+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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-03-07 04:29:33.234530133 +0000
+@@ -56,11 +56,18 @@
+ #include "services/management.hpp"
+ #include "services/memoryService.hpp"
+ #include "services/memTracker.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 = 16; // 64K words
+ const size_t ParallelCompactData::RegionSize = (size_t)1 << Log2RegionSize;
+@@ -451,6 +458,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());
+ memset(_block_data, 0, _block_vspace->committed_size());
+ }
+@@ -1977,6 +1987,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");
+
+@@ -3269,6 +3282,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);
+
+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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2014-03-07 04:29:33.234530133 +0000
+@@ -54,8 +54,17 @@
+ #include "runtime/vmThread.hpp"
+ #include "runtime/vm_operations.hpp"
+ #include "services/memoryService.hpp"
++#include "utilities/dtrace.hpp"
+ #include "utilities/stack.inline.hpp"
+
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__PSScavenge__begin, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__PSScavenge__end, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__PSParallelCompact__begin, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__PSParallelCompact__end, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__PSMarkSweep__begin, *uintptr_t, *uintptr_t);
++ HS_DTRACE_PROBE_DECL2(provider, gc__collection__PSMarkSweep__end, *uintptr_t, *uintptr_t);
++#endif /* !USDT2 */
+
+ HeapWord* PSScavenge::_to_space_top_before_gc = NULL;
+ int PSScavenge::_consecutive_skipped_scavenges = 0;
+@@ -228,7 +237,13 @@
+ PSAdaptiveSizePolicy* policy = heap->size_policy();
+ IsGCActiveMark mark;
+
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__PSScavenge__begin, &heap, heap->gc_cause());
++#endif /* !USDT2 */
+ const bool scavenge_done = PSScavenge::invoke_no_policy();
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__PSScavenge__end, &heap, heap->gc_cause());
++#endif /* !USDT2 */
+ const bool need_full_gc = !scavenge_done ||
+ policy->should_full_GC(heap->old_gen()->free_in_bytes());
+ bool full_gc_done = false;
+@@ -245,9 +260,21 @@
+ const bool clear_all_softrefs = cp->should_clear_all_soft_refs();
+
+ if (UseParallelOldGC) {
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__PSParallelCompact__begin, &heap, heap->gc_cause());
++#endif /* !USDT2 */
+ full_gc_done = PSParallelCompact::invoke_no_policy(clear_all_softrefs);
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__PSParallelCompact__end, &heap, heap->gc_cause());
++#endif /* !USDT2 */
+ } else {
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__PSMarkSweep__begin, &heap, heap->gc_cause());
++#endif /* !USDT2 */
+ full_gc_done = PSMarkSweep::invoke_no_policy(clear_all_softrefs);
++#ifndef USDT2
++ HS_DTRACE_PROBE2(hotspot, gc__collection__PSMarkSweep__end, &heap, heap->gc_cause());
++#endif /* !USDT2 */
+ }
+ }
+
+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-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-03-07 04:29:33.234530133 +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 )
+@@ -911,6 +917,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();
+@@ -1061,6 +1070,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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp 2014-03-07 04:31:15.676056944 +0000
+@@ -44,8 +44,13 @@
+ #include "runtime/java.hpp"
+ #include "runtime/thread.inline.hpp"
+ #include "utilities/copy.hpp"
++#include "utilities/dtrace.hpp"
+ #include "utilities/stack.inline.hpp"
+
++#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.
+
+@@ -558,6 +563,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");
+
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+@@ -706,6 +714,10 @@
+ jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
+ update_time_of_last_gc(now);
+
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__defnew__end, full, clear_all_soft_refs, size, is_tlab);
++#endif /* !USDT2 */
++
+ gch->trace_heap_after_gc(&gc_tracer);
+ 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 2014-03-06 09:11:53.000000000 +0000
++++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2014-03-07 04:29:33.234530133 +0000
+@@ -41,8 +41,14 @@
+ #include "oops/oop.inline.hpp"
+ #include "runtime/java.hpp"
+ #include "utilities/copy.hpp"
++#include "utilities/dtrace.hpp"
+ #include "utilities/events.hpp"
+
++#ifndef USDT2
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__contig__begin, bool, bool, size_t, bool);
++ HS_DTRACE_PROBE_DECL4(provider, gc__collection__contig__end, bool, bool, size_t, bool);
More information about the distro-pkg-dev
mailing list