[PATCH 0 of 5] Some jstack fixes and improvements

[Mark Wielaard]

On Fri, Mar 16, 2012 at 01:22:28PM +0100, Mark Wielaard wrote:
> On Wed, Mar 14, 2012 at 11:06:59AM +0100, Mark Wielaard wrote:
> > These are for IcedTea6. Next up is making sure everything works also
> > against IcedTea7.
> 
> Same apply to icedtea7. But there is one additional patch needed to
> accomodate for a hotspot change. S6990754: Use native memory and
> reference counting to implement SymbolTable. That changes the class
> symbolOopDescs to class Symbol. Also update the offset used to calculate
> methodOopDesc and sigOopDesc.

Forgot to attach the actual extra patch needed on icedtea7.
Attached now.

> Next on the list is adding Jon's tests so we catch these kind of changes
> early and often.
> 
> Cheers,
> 
> Mark
-------------- next part --------------
# HG changeset patch
# User Mark Wielaard <mark at klomp.org>
# Date 1331900115 -3600
# Node ID 732f30ec8b7baa0406b1e8d94fdb5297dbe7f8b6
# Parent  527807ac61967c121c19e55dfb3fbc738a5df277
jstack: Change symbolOopDesc to Symbol to accomodate S6990754.

Use native memory and reference counting to implement SymbolTable.

diff -r 527807ac6196 -r 732f30ec8b7b ChangeLog
--- a/ChangeLog	Wed Mar 14 10:55:24 2012 +0100
+++ b/ChangeLog	Fri Mar 16 13:15:15 2012 +0100
@@ -1,3 +1,9 @@
+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.
diff -r 527807ac6196 -r 732f30ec8b7b tapset/jstack.stp.in
--- a/tapset/jstack.stp.in	Wed Mar 14 10:55:24 2012 +0100
+++ b/tapset/jstack.stp.in	Fri Mar 16 13:15:15 2012 +0100
@@ -364,7 +364,7 @@
                   // 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
+                  // 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
@@ -379,17 +379,17 @@
                                    "@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
                   klassSymbol = @cast(klassPtr + oopDesc_size, "Klass",
                                       "@ABS_SERVER_LIBJVM_SO@")->_name;
-                  klassName = &@cast(klassSymbol, "symbolOopDesc",
+                  klassName = &@cast(klassSymbol, "Symbol",
                                      "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-                  klassLength = @cast(klassSymbol, "symbolOopDesc",
+                  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));
-                  methodName = &@cast(methodOopDesc, "symbolOopDesc",
+                  methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size)) - 1;
+                  methodName = &@cast(methodOopDesc, "Symbol",
                                       "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-                  methodLength = @cast(methodOopDesc, "symbolOopDesc",
+                  methodLength = @cast(methodOopDesc, "Symbol",
                                        "@ABS_SERVER_LIBJVM_SO@")->_length;
 
                   if (log_sig)
@@ -397,10 +397,10 @@
                       sigIndex = @cast(methodOopPtr, "methodOopDesc",
                                        "@ABS_SERVER_LIBJVM_SO@")->_constMethod->_signature_index;
                       sigOopDesc = user_long(constantPoolOop_base
-                                             + (sigIndex * ptr_size));
-                      sigName = &@cast(sigOopDesc, "symbolOopDesc",
+                                             + (sigIndex * ptr_size)) - 1;
+                      sigName = &@cast(sigOopDesc, "Symbol",
                                        "@ABS_SERVER_LIBJVM_SO@")->_body[0];
-                      sigLength = @cast(sigOopDesc, "symbolOopDesc",
+                      sigLength = @cast(sigOopDesc, "Symbol",
                                         "@ABS_SERVER_LIBJVM_SO@")->_length;
                       sig = user_string_n(sigName, sigLength);
                     }