/hg/icedtea6: Fix missing clazz argument to all hotspot.jni.Call...

mjw at icedtea.classpath.org mjw at icedtea.classpath.org
Sun Apr 10 13:58:09 PDT 2011


changeset ddd219edd416 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ddd219edd416
author: Mark Wielaard <mark at klomp.org>
date: Sun Apr 10 22:51:11 2011 +0200

	Fix missing clazz argument to all hotspot.jni.CallNonvirtual* stap
	probes.

	2011-04-10 Yasumasa Suenaga <suenaga.yasumasa at oss.ntt.co.jp>

	 * tapset/hotspot_jni.stp.in (hotspot.jni.CallNonvirtual*):
	Add missing clazz argument to all probes. Fix methodid to be
	last argument. Add clazz to probestr.


diffstat:

 ChangeLog                 |    6 +
 tapset/hotspot_jni.stp.in |  180 ++++++++++++++++++++++++++++++---------------
 2 files changed, 126 insertions(+), 60 deletions(-)

diffs (truncated from 616 to 500 lines):

diff -r 0239a181c7a0 -r ddd219edd416 ChangeLog
--- a/ChangeLog	Thu Mar 31 19:23:12 2011 -0400
+++ b/ChangeLog	Sun Apr 10 22:51:11 2011 +0200
@@ -1,3 +1,9 @@
+2011-04-10  Yasumasa Suenaga  <suenaga.yasumasa at oss.ntt.co.jp>
+
+	* tapset/hotspot_jni.stp.in (hotspot.jni.CallNonvirtual*):
+	Add missing clazz argument to all probes. Fix methodid
+	to be last argument. Add clazz to probestr.
+
 2011-03-31  Deepak Bhole <dbhole at redhat.com>
 
 	S7031385, PR680: Incorrect register allocation in
diff -r 0239a181c7a0 -r ddd219edd416 tapset/hotspot_jni.stp.in
--- a/tapset/hotspot_jni.stp.in	Thu Mar 31 19:23:12 2011 -0400
+++ b/tapset/hotspot_jni.stp.in	Sun Apr 10 22:51:11 2011 +0200
@@ -1067,6 +1067,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualBooleanMethodA =
@@ -1076,8 +1077,9 @@
   name = "CallNonvirtualBooleanMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualBooleanMethodA.return
@@ -1099,6 +1101,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualBooleanMethod =
@@ -1108,8 +1111,9 @@
   name = "CallNonvirtualBooleanMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualBooleanMethod.return
@@ -1131,6 +1135,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualBooleanMethodV =
@@ -1140,8 +1145,9 @@
   name = "CallNonvirtualBooleanMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualBooleanMethodV.return
@@ -1163,6 +1169,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualByteMethodA =
@@ -1172,8 +1179,9 @@
   name = "CallNonvirtualByteMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualByteMethodA.return
@@ -1195,6 +1203,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualByteMethod =
@@ -1204,8 +1213,9 @@
   name = "CallNonvirtualByteMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualByteMethod.return
@@ -1227,6 +1237,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualByteMethodV =
@@ -1236,8 +1247,9 @@
   name = "CallNonvirtualByteMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualByteMethodV.return
@@ -1259,6 +1271,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualCharMethodA =
@@ -1268,8 +1281,9 @@
   name = "CallNonvirtualCharMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualCharMethodA.return
@@ -1291,6 +1305,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualCharMethod =
@@ -1300,8 +1315,9 @@
   name = "CallNonvirtualCharMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualCharMethod.return
@@ -1323,6 +1339,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualCharMethodV =
@@ -1332,8 +1349,9 @@
   name = "CallNonvirtualCharMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualCharMethodV.return
@@ -1355,6 +1373,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualDoubleMethodA =
@@ -1364,8 +1383,9 @@
   name = "CallNonvirtualDoubleMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualDoubleMethodA.return
@@ -1384,6 +1404,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualDoubleMethod =
@@ -1393,8 +1414,9 @@
   name = "CallNonvirtualDoubleMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualDoubleMethod.return
@@ -1413,6 +1435,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualDoubleMethodV =
@@ -1422,8 +1445,9 @@
   name = "CallNonvirtualDoubleMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualDoubleMethodV.return
@@ -1442,6 +1466,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualFloatMethodA =
@@ -1451,8 +1476,9 @@
   name = "CallNonvirtualFloatMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualFloatMethodA.return
@@ -1471,6 +1497,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualFloatMethod =
@@ -1480,8 +1507,9 @@
   name = "CallNonvirtualFloatMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualFloatMethod.return
@@ -1500,6 +1528,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualFloatMethodV =
@@ -1509,8 +1538,9 @@
   name = "CallNonvirtualFloatMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualFloatMethodV.return
@@ -1529,6 +1559,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualIntMethodA =
@@ -1538,8 +1569,9 @@
   name = "CallNonvirtualIntMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualIntMethodA.return
@@ -1561,6 +1593,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualIntMethod =
@@ -1570,8 +1603,9 @@
   name = "CallNonvirtualIntMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualIntMethod.return
@@ -1593,6 +1627,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualIntMethodV =
@@ -1602,8 +1637,9 @@
   name = "CallNonvirtualIntMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualIntMethodV.return
@@ -1625,6 +1661,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualLongMethodA =
@@ -1634,8 +1671,9 @@
   name = "CallNonvirtualLongMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualLongMethodA.return
@@ -1657,6 +1695,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualLongMethod =
@@ -1666,8 +1705,9 @@
   name = "CallNonvirtualLongMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualLongMethod.return
@@ -1689,6 +1729,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualLongMethodV =
@@ -1698,8 +1739,9 @@
   name = "CallNonvirtualLongMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualLongMethodV.return
@@ -1721,6 +1763,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualObjectMethodA =
@@ -1730,8 +1773,9 @@
   name = "CallNonvirtualObjectMethodA"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualObjectMethodA.return
@@ -1753,6 +1797,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualObjectMethod =
@@ -1762,8 +1807,9 @@
   name = "CallNonvirtualObjectMethod"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualObjectMethod.return
@@ -1785,6 +1831,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.
+ * clazz - jclass reference.
  * methodid - ID of the method to call.
  */
 probe hotspot.jni.CallNonvirtualObjectMethodV =
@@ -1794,8 +1841,9 @@
   name = "CallNonvirtualObjectMethodV"
   env = $arg1
   obj = $arg2
-  methodid = $arg3
-  probestr = sprintf("%s(env=0x%x,obj=0x%x,methodid=0x%x)", name, env, obj, methodid)
+  clazz = $arg3
+  methodid = $arg4
+  probestr = sprintf("%s(env=0x%x,obj=0x%x,clazz=0x%x,methodid=0x%x)", name, env, obj, clazz, methodid)
 }
 
 /* hotspot.jni.CallNonvirtualObjectMethodV.return
@@ -1817,6 +1865,7 @@
  *
  * env - JNIEnv pointer.
  * obj - jobject reference.



More information about the distro-pkg-dev mailing list