Mercurial > hg > release > icedtea7-2.6
changeset 2674:8599fdfc398d
jstack.stp should be adapted CR#7172967
Reviewed-by: Jiri Vanek <jvanek@redhat.com> , Andrew Hughes <gnu.andrew@redhat.com>
Review-thread: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-October/024880.html
| author | Yasumasa Suenaga <yasu@ysfactory.dip.jp> |
|---|---|
| date | Wed, 02 Oct 2013 12:26:39 +0900 |
| parents | c3c661000904 |
| children | 2ded946dc6b6 |
| files | ChangeLog tapset/jstack.stp.in |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Sep 24 03:48:26 2013 +0100 +++ b/ChangeLog Wed Oct 02 12:26:39 2013 +0900 @@ -1,3 +1,7 @@ +2013-10-02 Yasumasa Suenaga <yasu@ysfactory.dip.jp> + + * jstack.stp should be adapted CR#7172967 + 2013-09-23 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: Add 2.4.2 release notes.
--- a/tapset/jstack.stp.in Tue Sep 24 03:48:26 2013 +0100 +++ b/tapset/jstack.stp.in Wed Oct 02 12:26:39 2013 +0900 @@ -85,7 +85,9 @@ Universe_collectedHeap[pid()] = %( systemtap_v >= "1.8" %? @var("_collectedHeap@universe.cpp") %: $_collectedHeap %); - HeapWordSize[pid()] = $HeapWordSize; + HeapWordSize[pid()] = %( systemtap_v >= "1.8" + %? @var("HeapWordSize") + %: $HeapWordSize %); /** * The CodeCache class contains the static CodeHeap _heap that @@ -395,7 +397,9 @@ // 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", + constMethodOopPtr = @cast(methodOopPtr, "methodOopDesc", + "@ABS_SERVER_LIBJVM_SO@")->_constMethod; + constantPoolOopDesc = @cast(constMethodOopPtr, "constMethodOopDesc", "@ABS_SERVER_LIBJVM_SO@")->_constants; constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;