/hg/icedtea7: 6 new changesets
mark at icedtea.classpath.org
mark at icedtea.classpath.org
Wed Mar 21 04:09:54 PDT 2012
changeset d679a8e581ec in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d679a8e581ec
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 16:29:10 2012 +0100
* tapset/jstack.stp.in: Don't hard code constantPoolOopDesc_size.
The size of constantPoolOopDesc had changed, but it was hard coded.
We use a trick now to calculate it from the DWARF data. Pretend we have
an array at address zero and take address of second element and we have
the size.
changeset 91870f1e0c92 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=91870f1e0c92
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 16:41:32 2012 +0100
jstack.stp support multiple running hotspots by indexing globals by pid().
changeset 3622f089d9f3 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=3622f089d9f3
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 17:24:50 2012 +0100
* tapset/jstack.stp.in: Use @var construct if available.
Newer versions of systemtap (since 1.8) make it possible to use the @var
construct if available to pick target variables from the right CU. Which
is needed by newer DWARF/gcc versions which don't add a defining variable
declaration to each CU anymore.
changeset 5cc05c7552ef in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=5cc05c7552ef
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 23:21:36 2012 +0100
* tapset/jstack.stp.in: Wrap heap accessors in try-catch block.
When we cannot read some part of the hotspot code heap catch that error
and report the frame (address) without trying to decode it.
changeset 527807ac6196 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=527807ac6196
author: Mark Wielaard <mark at klomp.org>
date: Wed Mar 14 10:55:24 2012 +0100
* Makefile.am (EXTRA_DIST): Add tapset/jstack.stp.in.
changeset 732f30ec8b7b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=732f30ec8b7b
author: Mark Wielaard <mark at klomp.org>
date: Fri Mar 16 13:15:15 2012 +0100
jstack: Change symbolOopDesc to Symbol to accomodate S6990754.
Use native memory and reference counting to implement SymbolTable.
diffstat:
ChangeLog | 30 +++++
Makefile.am | 1 +
tapset/jstack.stp.in | 287 ++++++++++++++++++++++++++++----------------------
3 files changed, 190 insertions(+), 128 deletions(-)
diffs (426 lines):
diff -r 5f0d96a60071 -r 732f30ec8b7b ChangeLog
--- a/ChangeLog Mon Feb 27 11:43:26 2012 -0500
+++ b/ChangeLog Fri Mar 16 13:15:15 2012 +0100
@@ -1,3 +1,33 @@
+2012-03-16 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Change symbolOopDesc to Symbol to accomodate
+ S6990754 - Use native memory and reference counting to implement
+ SymbolTable.
+
+2012-03-14 Mark Wielaard <mjw at redhat.com>
+
+ * Makefile.am (EXTRA_DIST): Add tapset/jstack.stp.in.
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Wrap heap accessors in try-catch block to be
+ able to report unusual frames.
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Use @var construct if available to pick
+ target variable from the right CU (needed by newer DWARF/gcc
+ versions).
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Index globals on pid() to support multiple
+ running hotspot jstacks at the same time.
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Don't hard code constantPoolOopDesc_size.
+
2012-02-24 Deepak Bhole <dbhole at redhat.com>
PR885: IcedTea7 does not build scripting support
diff -r 5f0d96a60071 -r 732f30ec8b7b Makefile.am
--- a/Makefile.am Mon Feb 27 11:43:26 2012 -0500
+++ b/Makefile.am Fri Mar 16 13:15:15 2012 +0100
@@ -713,6 +713,7 @@
hotspot.map autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
+ tapset/jstack.stp.in \
scripts/jni_create_stap.c \
scripts/jni_desc \
rewriter/agpl-3.0.txt \
diff -r 5f0d96a60071 -r 732f30ec8b7b tapset/jstack.stp.in
--- a/tapset/jstack.stp.in Mon Feb 27 11:43:26 2012 -0500
+++ b/tapset/jstack.stp.in Fri Mar 16 13:15:15 2012 +0100
@@ -1,5 +1,5 @@
/* jstack systemtap tapset, for extracting hotspot java backtraces.
- Copyright (C) 2009, Red Hat Inc.
+ Copyright (C) 2009, 2012 Red Hat Inc.
This file is part of IcedTea.
@@ -67,7 +67,9 @@
probe hotspot.vm_init_end
{
// The parent/type oop for a methodOop.
- Universe_methodKlassObj = $_methodKlassObj;
+ Universe_methodKlassObj[pid()] = %( systemtap_v >= "1.8"
+ %? @var("_methodKlassObj at universe.cpp")
+ %: $_methodKlassObj %);
// For compressed oops.
// Universe_heap_base = $_heap_base;
@@ -82,8 +84,10 @@
*
* Note that we access it through its "short name" _collectedHeap.
*/
- Universe_collectedHeap = $_collectedHeap;
- HeapWordSize = $HeapWordSize;
+ Universe_collectedHeap[pid()] = %( systemtap_v >= "1.8"
+ %? @var("_collectedHeap at universe.cpp")
+ %: $_collectedHeap %);
+ HeapWordSize[pid()] = $HeapWordSize;
/**
* The CodeCache class contains the static CodeHeap _heap that
@@ -101,7 +105,9 @@
* the segment at index - N (which can be recursive if a block
* contains more than 0xFE segments).
*/
- CodeCache_heap = $_heap;
+ CodeCache_heap[pid()] = %( systemtap_v >= "1.8"
+ %? @var("_heap at codeCache.cpp")
+ %: $_heap %);
// Should really check arch of user space (for 32bit jvm on 64bit kernel).
%( arch == "i386" %?
@@ -110,22 +116,33 @@
pc_register = "eip";
ptr_size = 4;
ptr_mask = 0xFFFFFFFF;
- constantPoolOopDesc_size = 32; // Should use dwarf @size
%: %(arch == "x86_64" %?
sp_register = "rsp";
fp_register = "rbp";
pc_register = "rip";
ptr_size = 8; // XXX - might be probing 32-on-64 jvm.
ptr_mask = 0xFFFFFFFFFFFFFFFF;
- constantPoolOopDesc_size = 56; // Should use dwarf @size
%: **ERROR** unknown architecture
%) %)
+ // Pretend we have an array at address zero and take address of second
+ // element and we have the size.
+ constantPoolOopDesc_size = &@cast(0, "constantPoolOopDesc")[1];
+
// Really should get from dwarf: @size("HeapBlock::Header"), @size("oopDesc")
HeapBlock_Header_size = 2 * ptr_size;
oopDesc_size = 2 * ptr_size;
- vm_inited = 1;
+ vm_inited[pid()] = 1;
+}
+
+probe hotspot.vm_shutdown
+{
+ delete(Universe_methodKlassObj[pid()]);
+ delete(Universe_collectedHeap[pid()]);
+ delete(HeapWordSize[pid()]);
+ delete(CodeCache_heap[pid()]);
+ delete(vm_inited[pid()]);
}
function jstack:string()
@@ -223,7 +240,7 @@
function jstack_call:string(max_depth:long, log_sig:long, log_native:long,
print_frames:long)
{
- if (! vm_inited)
+ if (! vm_inited[pid()])
{
frame = "<vm-not-inited>";
if (print_frames)
@@ -236,23 +253,23 @@
}
// Extract heap and code bounds.
- heap_start = @cast(Universe_collectedHeap,
+ heap_start = @cast(Universe_collectedHeap[pid()],
"CollectedHeap",
"@ABS_SERVER_LIBJVM_SO@")->_reserved->_start;
- heap_size = HeapWordSize * @cast(Universe_collectedHeap,
+ heap_size = HeapWordSize[pid()] * @cast(Universe_collectedHeap[pid()],
"CollectedHeap",
"@ABS_SERVER_LIBJVM_SO@")->_reserved->_word_size;
heap_end = heap_start + heap_size;
- CodeCache_low = @cast(CodeCache_heap, "CodeHeap",
+ CodeCache_low = @cast(CodeCache_heap[pid()], "CodeHeap",
"@ABS_SERVER_LIBJVM_SO@")->_memory->_low;
- CodeCache_high = @cast(CodeCache_heap, "CodeHeap",
+ CodeCache_high = @cast(CodeCache_heap[pid()], "CodeHeap",
"@ABS_SERVER_LIBJVM_SO@")->_memory->_high;
- CodeHeap_log2_segment_size = @cast(CodeCache_heap,
+ CodeHeap_log2_segment_size = @cast(CodeCache_heap[pid()],
"CodeHeap",
"@ABS_SERVER_LIBJVM_SO@")->_log2_segment_size;
- CodeCache_segmap_low = @cast(CodeCache_heap,
+ CodeCache_segmap_low = @cast(CodeCache_heap[pid()],
"CodeHeap",
"@ABS_SERVER_LIBJVM_SO@")->_segmap->_low;
@@ -292,129 +309,143 @@
}
block = CodeCache_low + (segment << CodeHeap_log2_segment_size);
- // Do some sanity checking.
- used = @cast(block, "HeapBlock",
- "@ABS_SERVER_LIBJVM_SO@")->_header->_used;
- if (used != 1)
+ // Some of this is "fuzzy" so catch any read error in case we
+ // "guessed" wrong.
+ try
{
- // Something very odd has happened.
- frame = sprintf("0x%x <?unused-code-block?>", pc);
- blob_name = "unused";
- trust_fp = 0;
- frame_size = 0;
- }
- else
- {
- // We don't like spaces in frames (makes it hard to return
- // a space separated frame list). So make sure they are
- // replaced by underscores when used in frames.
- blob = block + HeapBlock_Header_size;
- blob_name_ptr = @cast(blob, "CodeBlob",
- "@ABS_SERVER_LIBJVM_SO@")->_name;
- blob_name = ((blob_name_ptr == 0) ? "<unknown-code-blob>"
- : user_string(blob_name_ptr));
- }
- // For compiled code the methodOop is part of the code blob.
- // For the interpreter (and other code blobs) it is on the
- // stack relative to the frame pointer.
- if (blob_name == "nmethod")
- methodOopPtr = @cast(blob, "nmethod",
- "@ABS_SERVER_LIBJVM_SO@")->_method
- else
- methodOopPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
-
- // Start optimistic. A methodOop is only valid if it was
- // heap allocated. And if the "type class" oop equals the
- // Universe::methodKlassObj.
- if (heap_start > methodOopPtr || methodOopPtr >= heap_end)
- isMethodOop = 0
- else
- {
- methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_metadata->_klass;
- isMethodOop = (methodOopKlass == Universe_methodKlassObj);
- }
-
- if (isMethodOop)
- {
- // The java class is the holder of the constants (strings)
- // that describe the method and signature. This constant pool
- // contains symbolic information that describe the properties
- // of the class. The indexes for methods and signaturates in
- // the constant pool are symbolOopDescs that contain utf8
- // strings (plus lenghts). (We could also sanity check that
- // the tag value is correct [CONSTANT_String = 8]).
- // Note that the class name uses '/' instead of '.' as
- // package name separator and that the method signature is
- // encoded as a method descriptor string. Both of which we
- // don't demangle here.
- constantPoolOopDesc = @cast(methodOopPtr, "methodOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_constants;
- constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;
-
- klassPtr = @cast(constantPoolOopDesc, "constantPoolOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
- klassSymbol = @cast(klassPtr + oopDesc_size, "Klass",
- "@ABS_SERVER_LIBJVM_SO@")->_name;
- klassName = &@cast(klassSymbol, "symbolOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
- klassLength = @cast(klassSymbol, "symbolOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_length;
-
- methodIndex = @cast(methodOopPtr, "methodOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_name_index;
- methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size));
- methodName = &@cast(methodOopDesc, "symbolOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
- methodLength = @cast(methodOopDesc, "symbolOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_length;
-
- if (log_sig)
+ // Do some sanity checking.
+ used = @cast(block, "HeapBlock",
+ "@ABS_SERVER_LIBJVM_SO@")->_header->_used;
+ if (used != 1)
{
- sigIndex = @cast(methodOopPtr, "methodOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_signature_index;
- sigOopDesc = user_long(constantPoolOop_base
- + (sigIndex * ptr_size));
- sigName = &@cast(sigOopDesc, "symbolOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_body[0];
- sigLength = @cast(sigOopDesc, "symbolOopDesc",
- "@ABS_SERVER_LIBJVM_SO@")->_length;
- sig = user_string_n(sigName, sigLength);
+ // Something very odd has happened.
+ frame = sprintf("<unused_code_block at 0x%x>", pc);
+ blob_name = "unused";
+ trust_fp = 0;
+ frame_size = 0;
}
else
- sig = "";
+ {
+ // We don't like spaces in frames (makes it hard to return
+ // a space separated frame list). So make sure they are
+ // replaced by underscores when used in frames.
+ blob = block + HeapBlock_Header_size;
+ blob_name_ptr = @cast(blob, "CodeBlob",
+ "@ABS_SERVER_LIBJVM_SO@")->_name;
+ blob_name = ((blob_name_ptr == 0) ? "<unknown-code-blob>"
+ : user_string(blob_name_ptr));
+ }
- code_name = (log_native
- ? sprintf("<%s at 0x%x>",
- str_replace(blob_name, " ", "_"), pc)
- : "");
+ // For compiled code the methodOop is part of the code blob.
+ // For the interpreter (and other code blobs) it is on the
+ // stack relative to the frame pointer.
+ if (blob_name == "nmethod")
+ methodOopPtr = @cast(blob, "nmethod",
+ "@ABS_SERVER_LIBJVM_SO@")->_method
+ else
+ methodOopPtr = user_long(fp + (-3 * ptr_size)) & ptr_mask
- frame = sprintf("%s.%s%s%s",
- user_string_n(klassName, klassLength),
- user_string_n(methodName, methodLength),
- sig, code_name);
+ // Start optimistic. A methodOop is only valid if it was
+ // heap allocated. And if the "type class" oop equals the
+ // Universe::methodKlassObj.
+ if (heap_start > methodOopPtr || methodOopPtr >= heap_end)
+ isMethodOop = 0
+ else
+ {
+ methodOopKlass = @cast(methodOopPtr, "methodOopDesc",
+ "@ABS_SERVER_LIBJVM_SO@")->_metadata->_klass;
+ isMethodOop = (methodOopKlass == Universe_methodKlassObj[pid()]);
+ }
+
+ if (isMethodOop)
+ {
+ // The java class is the holder of the constants (strings)
+ // that describe the method and signature. This constant pool
+ // contains symbolic information that describe the properties
+ // of the class. The indexes for methods and signaturates in
+ // the constant pool are Symbols that contain utf8
+ // strings (plus lenghts). (We could also sanity check that
+ // the tag value is correct [CONSTANT_String = 8]).
+ // Note that the class name uses '/' instead of '.' as
+ // package name separator and that the method signature is
+ // encoded as a method descriptor string. Both of which we
+ // don't demangle here.
+ constantPoolOopDesc = @cast(methodOopPtr, "methodOopDesc",
+ "@ABS_SERVER_LIBJVM_SO@")->_constants;
+ constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;
+
+ klassPtr = @cast(constantPoolOopDesc, "constantPoolOopDesc",
+ "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
+ klassSymbol = @cast(klassPtr + oopDesc_size, "Klass",
+ "@ABS_SERVER_LIBJVM_SO@")->_name;
+ klassName = &@cast(klassSymbol, "Symbol",
+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
+ klassLength = @cast(klassSymbol, "Symbol",
+ "@ABS_SERVER_LIBJVM_SO@")->_length;
+
+ methodIndex = @cast(methodOopPtr, "methodOopDesc",
+ "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_name_index;
+ methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size)) - 1;
+ methodName = &@cast(methodOopDesc, "Symbol",
+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
+ methodLength = @cast(methodOopDesc, "Symbol",
+ "@ABS_SERVER_LIBJVM_SO@")->_length;
+
+ if (log_sig)
+ {
+ sigIndex = @cast(methodOopPtr, "methodOopDesc",
+ "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_signature_index;
+ sigOopDesc = user_long(constantPoolOop_base
+ + (sigIndex * ptr_size)) - 1;
+ sigName = &@cast(sigOopDesc, "Symbol",
+ "@ABS_SERVER_LIBJVM_SO@")->_body[0];
+ sigLength = @cast(sigOopDesc, "Symbol",
+ "@ABS_SERVER_LIBJVM_SO@")->_length;
+ sig = user_string_n(sigName, sigLength);
+ }
+ else
+ sig = "";
+
+ code_name = (log_native
+ ? sprintf("<%s at 0x%x>",
+ str_replace(blob_name, " ", "_"), pc)
+ : "");
+
+ frame = sprintf("%s.%s%s%s",
+ user_string_n(klassName, klassLength),
+ user_string_n(methodName, methodLength),
+ sig, code_name);
+ }
+ else
+ {
+ // This is probably just an internal function, not a java
+ // method, just print the blob_name and continue.
+ // fp is probably still trusted.
+ if (log_native)
+ frame = sprintf("<%s at 0x%x>",
+ str_replace(blob_name, " ", "_"), pc);
+ }
+
+ // We cannot trust the frame pointer of compiled methods.
+ // The server (c2) jit compiler uses the fp register.
+ // We do know the method frame size on the stack. But
+ // this seems to be useful only as a hint of the minimum
+ // stack being used.
+ if (blob_name == "nmethod")
+ {
+ trust_fp = 0;
+ frame_size = @cast(blob, "CodeBlob",
+ "@ABS_SERVER_LIBJVM_SO@")->_frame_size;
+ }
+
}
- else
+ catch
{
- // This is probably just an internal function, not a java
- // method, just print the blob_name and continue.
- // fp is probably still trusted.
- if (log_native)
- frame = sprintf("<%s at 0x%x>",
- str_replace(blob_name, " ", "_"), pc);
- }
-
- // We cannot trust the frame pointer of compiled methods.
- // The server (c2) jit compiler uses the fp register.
- // We do know the method frame size on the stack. But
- // this seems to be useful only as a hint of the minimum
- // stack being used.
- if (blob_name == "nmethod")
- {
+ // Some assumption above totally failed and we got an address
+ // read error. Give up and mark frame pointer as suspect.
+ frame = sprintf("<unknown_frame at 0x%x>", pc);
trust_fp = 0;
- frame_size = @cast(blob, "CodeBlob",
- "@ABS_SERVER_LIBJVM_SO@")->_frame_size;
}
}
else
More information about the distro-pkg-dev
mailing list