/hg/icedtea7: Enhanced garbage collection dtrace/systemtap instr...
vanaltj at icedtea.classpath.org
vanaltj at icedtea.classpath.org
Wed Oct 24 22:00:50 PDT 2012
changeset 86d2b1dac5ce in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=86d2b1dac5ce
author: Lukas Berk <lberk at redhat.com>
date: Wed Oct 24 21:58:03 2012 -0400
Enhanced garbage collection dtrace/systemtap instrumentation.
2012-10-24 Lukas Berk <lberk at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add patches/systemtap.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.
diffstat:
ChangeLog | 13 +
Makefile.am | 15 +-
configure.ac | 1 +
patches/systemtap_gc.patch | 369 +++++++++++++++++++++++++++++++
tapset/hotspot_gc.stp.in | 534 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 931 insertions(+), 1 deletions(-)
diffs (truncated from 998 to 500 lines):
diff -r 67d42446bc25 -r 86d2b1dac5ce ChangeLog
--- a/ChangeLog Wed Sep 26 14:52:49 2012 +0100
+++ b/ChangeLog Wed Oct 24 21:58:03 2012 -0400
@@ -1,3 +1,16 @@
+2012-10-24 Lukas Berk <lberk at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patches/systemtap.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-09-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 67d42446bc25 -r 86d2b1dac5ce Makefile.am
--- a/Makefile.am Wed Sep 26 14:52:49 2012 +0100
+++ b/Makefile.am Wed Oct 24 21:58:03 2012 -0400
@@ -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
@@ -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 86d2b1dac5ce configure.ac
--- a/configure.ac Wed Sep 26 14:52:49 2012 +0100
+++ b/configure.ac Wed Oct 24 21:58:03 2012 -0400
@@ -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 86d2b1dac5ce patches/systemtap_gc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/systemtap_gc.patch Wed Oct 24 21:58:03 2012 -0400
@@ -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");
+ GenCollectedHeap* gch = GenCollectedHeap::heap();
+ _next_gen = gch->next_gen(this);
+@@ -661,6 +668,10 @@
+ // does not guarantee monotonicity.
+ 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 */
++
+ }
+
+ class RemoveForwardPointerClosure: public ObjectClosure {
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2012-08-15 12:03:43.044543106 -0400
++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2012-08-15 12:25:26.632316692 -0400
+@@ -55,6 +55,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;
+@@ -1647,7 +1653,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,
+--- openjdk.orig/hotspot/src/share/vm/memory/generation.cpp 2012-08-15 12:03:43.009543167 -0400
++++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2012-08-15 12:27:46.378095083 -0400
+@@ -39,8 +39,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);
++#endif /* !USDT2 */
++
+ Generation::Generation(ReservedSpace rs, size_t initial_size, int level) :
+ _level(level),
+ _ref_processor(NULL) {
+@@ -470,7 +476,13 @@
+ // refs discovery is over the entire heap, not just this generation
+ ReferenceProcessorSpanMutator
+ x(ref_processor(), GenCollectedHeap::heap()->reserved_region());
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__contig__begin, full, clear_all_soft_refs, size, is_tlab);
++#endif /* !USDT2 */
+ GenMarkSweep::invoke_at_safepoint(_level, ref_processor(), clear_all_soft_refs);
++#ifndef USDT2
++ HS_DTRACE_PROBE4(hotspot, gc__collection__contig__end, full, clear_all_soft_refs, size, is_tlab);
++#endif /* !USDT2 */
+ SpecializationStats::print();
+ }
+
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2012-07-25 13:24:07.000000000 -0400
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2012-08-17 10:26:44.181117802 -0400
+@@ -51,8 +51,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;
+@@ -226,7 +235,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;
+@@ -243,9 +258,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 */
+ }
+ }
+
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2012-07-25 13:24:07.000000000 -0400
++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2012-08-31 15:14:23.936576341 -0400
+@@ -40,8 +40,14 @@
+ #include "runtime/handles.inline.hpp"
+ #include "runtime/java.hpp"
+ #include "runtime/vmThread.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;
+ PSPermGen* ParallelScavengeHeap::_perm_gen = NULL;
+@@ -806,7 +812,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 */
+ }
+
+ // This interface assumes that it's being called by the
diff -r 67d42446bc25 -r 86d2b1dac5ce tapset/hotspot_gc.stp.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tapset/hotspot_gc.stp.in Wed Oct 24 21:58:03 2012 -0400
@@ -0,0 +1,534 @@
+/*
+ * probe - gc_collect_contig_begin
+ *
+ * @name: gc_collect_contig_begin
+ * @is_full: If TRUE, attempt a full collection of the generation.
+ * Else; perform a scavenge
+ * @size: The collection should achieve a minimum region of available
+ * memory to allow for an allocation of 'size'.
+ * @is_tlab: Is this a Thread Local Allocation Buffer?
+ *
+ * Description: This marks the start of a contiguous space generation collection.
+ *
+ */
+
+probe hotspot.gc_collect_contig_begin =
+ process("@ABS_CLIENT_LIBJVM_SO@").mark("gc__collection__contig__begin"),
+ process("@ABS_SERVER_LIBJVM_SO@").mark("gc__collection__contig__begin")
+{
+
+ name = "gc_collect_contig_begin";
+ is_full = $arg2;
+ size = $arg3;
+ is_tlab = $arg4;
+ probestr = sprintf("%s(is_full='%d', size='%d', is_tlab='%d')", name, is_full, size, is_tlab);
+
+}
+
+/*
+ * probe - gc_collect_contig_end
+ *
+ * @name: gc_collect_contig_end_
+ * @is_full: If TRUE, attempt a full collection of the generation.
+ * Else; perform a scavenge.
+ * @size: The collection should achieve a minimum region of available
+ * memory to allow for an allocation of 'size'.
+ * @is_tlab: Is this a Thread Local Allocation Buffer?
More information about the distro-pkg-dev
mailing list