You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/06/15 06:27:55 UTC

svn commit: r784668 - in /incubator/kato/branches/experimental/PyJVMTI: kato/XMLDump.py pyjvmti.h

Author: spoole
Date: Mon Jun 15 06:27:55 2009
New Revision: 784668

URL: http://svn.apache.org/viewvc?rev=784668&view=rev
Log:
updated jmvti project to read the new xml format dump

Modified:
    incubator/kato/branches/experimental/PyJVMTI/kato/XMLDump.py
    incubator/kato/branches/experimental/PyJVMTI/pyjvmti.h

Modified: incubator/kato/branches/experimental/PyJVMTI/kato/XMLDump.py
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/PyJVMTI/kato/XMLDump.py?rev=784668&r1=784667&r2=784668&view=diff
==============================================================================
--- incubator/kato/branches/experimental/PyJVMTI/kato/XMLDump.py (original)
+++ incubator/kato/branches/experimental/PyJVMTI/kato/XMLDump.py Mon Jun 15 06:27:55 2009
@@ -21,17 +21,29 @@
 
 import jvmti
 import base64
-import array
+import array as arraybuilder
+
+savedmethods=set()
+savedclasses=set()
+
+arraymap = {'char':   ['c',jvmti.getCharArrayElements],
+            'int':    ['i',jvmti.getIntArrayElements] ,
+            'bool':   ['b',jvmti.getBooleanArrayElements] ,
+            'short':  ['h',jvmti.getShortArrayElements] ,
+            'long':   ['l',jvmti.getLongArrayElements] ,
+            'float':  ['f',jvmti.getFloatArrayElements] ,
+            'double': ['d',jvmti.getDoubleArrayElements] ,
+            'byte':   ['b',jvmti.getByteArrayElements] }
+
 
-methods=set()
-classes=set()
 
 def katodump(filename="kato.xml"):
     '''
     dump to provided file in XML format
     '''
-    methods=set()
-    classes=set()
+    savedmethods.clear()
+    savedclasses.clear()
+    
     kml=open(filename,"w")
     
     # write xml header
@@ -75,11 +87,11 @@
     '''
     
 
-    if classid in classes :
-        return
+    if classid in savedclasses :
+        return JClass(classid)
     
 
-    classes.add(classid)
+    savedclasses.add(classid)
     clazz=JClass(classid)
     
     
@@ -89,8 +101,9 @@
     
     for f in clazz.fields :
         field=JField(clazz,f)
-        if field.isStatic : saveStaticField(kml,clazz,field)
-            
+        saveFieldDef(kml,clazz,field)
+        
+        
     kml.write("</class>\n")
     return clazz;
 
@@ -104,301 +117,203 @@
     
     print "saving  instance "
     
-    kml.write('<instance classid="%d" id="%d"> \n' % (classid,objid))
+    kml.write('<instance classid="%d" id="%d" sig="%s">\n' % (classid,objid,clazz.signature))
     
     for f in clazz.fields :
         field=JField(clazz,f)
         if field.isStatic is False  : saveInstanceField(kml,field,objid)
             
-    kml.write("</class>\n")
+    kml.write("</instance>\n")
     
  
 
-def saveStaticField(kml,clazz,field):
+def saveFieldDef(kml,clazz,field):
     
-        print "saving static field %s in clazz %s " % (field.name ,clazz.signature) 
-        kml.write('<field static="true" signature="%s" name="%s">\n'  % (field.signature, field.name) )
+        if field.isStatic == False :
+            kml.write('<fielddef id="%d" signature="%s" name="%s"/>\n'  % (field.fieldid,field.signature, field.name) ) 
+            return
+        
+        # for static fields we write out values
         
+        kml.write('<fielddef id="%d" static="true" signature="%s" name="%s">\n'  % (field.fieldid,field.signature, field.name) )
+            
         signature=field.signature
         
         try :
          
             if signature=='Z' :
                 value=jvmti.getStaticBooleanField(clazz.classid,field.fieldid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<bool value="%d"/>\n' % value)
             
             elif signature=='C' :
                 value=jvmti.getStaticCharField(clazz.classid,field.fieldid)
-                kml.write('<data value="%c"/>\n' % value)
+                kml.write('<char value="%c"/>\n' % value)
                 
             elif signature=='I' :
                 value=jvmti.getStaticIntField(clazz.classid,field.fieldid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<int value="%d"/>\n' % value)
             
             elif signature=='B' :
                 value=jvmti.getStaticByteField(clazz.classid,field.fieldid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<byte value="%d"/>\n' % value)
             
             elif signature=='S' :
                 value=jvmti.getStaticShortField(clazz.classid,field.fieldid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<short value="%d"/>\n' % value)
             
             elif signature=='J' :
                 value=jvmti.getStaticLongField(clazz.classid,field.fieldid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<long value="%d"/>\n' % value)
             
             elif signature=='F' :
                 value=jvmti.getStaticFloatField(clazz.classid,field.fieldid)
-                kml.write('<data value="%f"/>\n' % value)
+                kml.write('<float value="%f"/>\n' % value)
             
             elif signature=='D' :
                 value=jvmti.getStaticDoubleField(clazz.classid,field.fieldid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<double value="%d"/>\n' % value)
             
             elif signature=='Ljava/lang/String;' :
                 objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
                 if objvalue == 0 :
-                    kml.write('<data nullvalue="true"/>\n')
+                    kml.write('<null/>\n')
                 else :
                     string=jvmti.getStringUTFChars(objvalue)
-                    kml.write('<data value="%s"/>\n' % string)
+                    kml.write('<string value="%s"/>\n' % string)
                 
                 
             elif signature=='[C' :
-                 
-                  
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 chararray=jvmti.getCharArrayElements(objvalue)
-                 arraylen=len(chararray)
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                 data=array.array('c')
-                 
-                 for element in chararray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                     
+                 writeArray(kml,'char',objvalue)
              
             elif signature=='[I' :
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 intarray=jvmti.getIntArrayElements(objvalue)
-                 arraylen=len(intarray)
-                 
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                 data=array.array('i')
-                 
-                 for element in intarray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
+                 writeArray(kml,'imt',objvalue)
             
             elif signature=='[B' :
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 barray=jvmti.getByteArrayElements(objvalue)
-                 arraylen=len(barray)
-                 
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                 data=array.array('b')
-                 
-                 for element in barray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
+                 writeArray(kml,'byte',objvalue)
                  
             elif signature=='[Z' :
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 barray=jvmti.getBooleanArrayElements(objvalue)
-                 arraylen=len(barray)
-                 
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                 data=array.array('b')
-                 
-                 for element in barray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")     
-                
+                 writeArray(kml,'bool',objvalue)
+                             
             elif signature=='[S' :
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 sarray=jvmti.getShortArrayElements(objvalue)
-                 arraylen=len(sarray)
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                 data=array.array('h')
-                 
-                 for element in sarray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
-                 
+                 writeArray(kml,'short',objvalue)
                  
             elif signature=='[J' :
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 larray=jvmti.getLongArrayElements(objvalue)
-                 arraylen=len(larray)
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                 data=array.array('l')
-                 
-                 for element in larray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
-         
-            
+                 writeArray(kml,'long',objvalue)
+                    
             elif signature=='[F' :
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 farray=jvmti.getFloatArrayElements(objvalue)
-                 arraylen=len(farray)
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
+                 writeArray(kml,'float',objvalue)
                  
-                 data=array.array('f')
-                 
-                 for element in farray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
-                 
-            
             elif signature=='[D' :
                  objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                 darray=jvmti.getDoubleArrayElements(objvalue)
-                 arraylen=len(darray)
-                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                 data=array.array('d')
-                 
-                 for element in darray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
+                 writeArray(kml,'double',objvalue)
                  
             elif signature=='[Ljava/lang/String;' :
                 
-                kml.write('<skipping sig="%s"/></field>\n' % signature)
+                kml.write('<skipping sig="%s"/>\n</fielddef>\n' % signature)
                 return 
                 objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
+                
                 if objvalue==0 : 
-                    arraylen=0
-                   
+                    kml.write('<null/>')
                 else :
                     arraylen=jvmti.getArrayLength(objvalue)
+                    kml.write('<string ref="%d" length="%d">\n' % (objvalue,arraylen))
                 
-                kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                
-                if arraylen > 0 :
-                    for i in range (0 ,arraylen)  :
-                        elementID=jvmti.getObjectArrayElement(objvalue,i)
-                        string=jvmti.getStringUTFChars(elementID)
-                        kml.write('<entry id="%d" value="%s"/>' % (elementID,string))
+                    if arraylen > 0 :
+                        for i in range (0 ,arraylen)  :
+                            elementID=jvmti.getObjectArrayElement(objvalue,i)
+                            if elementID==0 :
+                                kml.write('<null/>')
+                            else :
+                                string=jvmti.getStringUTFChars(elementID)
+                                kml.write('<string id="%d" value="%s"/>' % (elementID,string))
                         
-                kml.write("</data>\n")
+                    kml.write("</string\n")
                 
                 
             elif signature[0]=='[' :
-                kml.write('<skipping sig="%s"/></field>\n' % signature)
+                kml.write('<skipping sig="%s"/></fielddef>\n' % signature)
                 return 
                 objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
                 if objvalue==0 : 
-                    arraylen=0
-                    
+                    kml.write('<null/>')
                 else :
                     arraylen=jvmti.getArrayLength(objvalue)
-                
-                kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                if arraylen > 0 :
-                    data=array.array('i')
-                    for i in range (0 ,arraylen)  :
-                        elementID=jvmti.getObjectArrayElement(objvalue,i)
-                        data.append(elementID)
-                    kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                        
-                kml.write("</data>\n")
+                    if arraylen > 0 :
+                        kml.write('<instance ref="%d" length="%d">\n' % (objvalue,arraylen))
+                        data=arraybuilder.array('i')
+                        for i in range (0 ,arraylen)  :
+                            elementID=jvmti.getObjectArrayElement(objvalue,i)
+                            data.append(elementID)
+                        kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
+                        kml.write("</instance>\n")
+                    else :
+                        kml.write('<instance ref="%d" length="0"/>\n' % objvalue)
                 
             else :
-                kml.write('<skipping sig="%s"/></field>\n' % signature)
+                kml.write('<skipping sig="%s"/></fielddef>\n' % signature)
                 return 
                 objvalue=jvmti.getStaticObjectField(clazz.classid,field.fieldid)
-                
-                clazzid=0
-                if objvalue!=0 :
+                if objvalue==0 : 
+                    kml.write('<null/>')
+                else :
                     clazzid=jvmti.getObjectClass(objvalue)
                     saveClass(kml,clazzid)
-
-                kml.write('<data classid="%d" object="%d">\n' % (clazzid,objvalue))
-                kml.write("</data>\n")
+                    kml.write('<data classid="%d" object="%d">\n' % (clazzid,objvalue))
+                    kml.write("</data>\n")
                 
         except jvmti.error :
                 
                print "err..." , jvmti.error , signature
-          
-  
-        
-        kml.write('</field>\n')
+                
+        kml.write('</fielddef>\n')
         
 def saveInstanceField(kml,field,objectid):
     
     print "saving instance field %s  " % (field.name) 
-    kml.write('<field  signature="%s" name="%s"/>\n' % (field.signature, field.name) )
+    kml.write('<field id="%d" signature="%s" name="%s">\n' % (field.fieldid,field.signature, field.name) )
     signature=field.signature
         
     try :
          
             if signature=='Z' :
                 value=jvmti.getBooleanField(field.fieldid,objectid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<bool value="%d"/>\n' % value)
             
             elif signature=='C' :
                 value=jvmti.getCharField(field.fieldid,objectid)
-                kml.write('<data value="%c"/>\n' % value)
+                kml.write('<char value="%c"/>\n' % value)
                 
             elif signature=='I' :
                 value=jvmti.getIntField(field.fieldid,objectid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<int value="%d"/>\n' % value)
             
             elif signature=='B' :
                 value=jvmti.getByteField(field.fieldid,objectid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<byte value="%d"/>\n' % value)
             
             elif signature=='S' :
                 value=jvmti.getShortField(field.fieldid,objectid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<short value="%d"/>\n' % value)
             
             elif signature=='J' :
                 value=jvmti.getLongField(field.fieldid,objectid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<long value="%d"/>\n' % value)
             
             elif signature=='F' :
                 value=jvmti.getFloatField(field.fieldid,objectid)
-                kml.write('<data value="%f"/>\n' % value)
+                kml.write('<float value="%f"/>\n' % value)
             
             elif signature=='D' :
                 value=jvmti.getDoubleField(field.fieldid,objectid)
-                kml.write('<data value="%d"/>\n' % value)
+                kml.write('<double value="%d"/>\n' % value)
             
             elif signature=='Ljava/lang/String;' :
                 objvalue=jvmti.getObjectField(field.fieldid,objectid)
@@ -406,193 +321,67 @@
                     kml.write('<null/>\n')
                 else :
                     string=jvmti.getStringUTFChars(objvalue)
-                    kml.write('<data value="%s"/>\n' % string)
+                    kml.write('<string value="%s"/>\n' % string)
                 
                 
             elif signature=='[C' :
                  
                   
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                 
-                     chararray=jvmti.getCharArrayElements(objvalue)
-                     arraylen=len(chararray)
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('c')
-                 
-                     for element in chararray :
-                         data.append(element)
-                 
-                     kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
+                 writeArray(kml,'char',objvalue)
                      
              
             elif signature=='[I' :
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                     intarray=jvmti.getIntArrayElements(objvalue)
-                     arraylen=len(intarray)
-                 
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('i')
-                 
-                     for element in intarray :
-                         data.append(element)
-                 
-                     kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
+                 writeArray(kml,'int',objvalue)                 
             
             elif signature=='[B' :
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                     barray=jvmti.getByteArrayElements(objvalue)
-                     arraylen=len(barray)
-                 
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('b')
-                 
-                     for element in barray :
-                         data.append(element)
-                 
-                     kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
+                 writeArray(kml,'byte',objvalue)
                  
             elif signature=='[Z' :
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                 
-                     barray=jvmti.getBooleanArrayElements(objvalue)
-                     arraylen=len(barray)
-                 
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('b')
-                 
-                     for element in barray :
-                         data.append(element)
-                 
-                     kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")     
+                 writeArray(kml,'bool',objvalue)
                 
             elif signature=='[S' :
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                     sarray=jvmti.getShortArrayElements(objvalue)
-                     arraylen=len(sarray)
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('h')
-                 
-                     for element in sarray :
-                         data.append(element)
-                 
-                     kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
-                 
+                 writeArray(kml,'short',objvalue)
                  
             elif signature=='[J' :
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                     larray=jvmti.getLongArrayElements(objvalue)
-                     arraylen=len(larray)
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('l')
-                 
-                     for element in larray :
-                         data.append(element)
-                 
-                     kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
+                 writeArray(kml,'long',objvalue)
          
             
             elif signature=='[F' :
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                 
-                     farray=jvmti.getFloatArrayElements(objvalue)
-                     arraylen=len(farray)
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('f')
-                 
-                     for element in farray :
-                         data.append(element)
-                 
-                         kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</data>\n")
-                 
+                 writeArray(kml,'float',objvalue)        
                  
             
             elif signature=='[D' :
                  objvalue=jvmti.getObjectField(field.fieldid,objectid)
-                 if objvalue == 0 :
-                     kml.write('<null/>\n')
-                 else :
-                 
-                     darray=jvmti.getDoubleArrayElements(objvalue)
-                     arraylen=len(darray)
-                     kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                 
-                     data=array.array('d')
-                 
-                     for element in darray :
-                         data.append(element)
-                 
-                     kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
+                 writeArray(kml,'double',objvalue)
                      
-                 kml.write("</data>\n")
                  
             elif signature=='[Ljava/lang/String;' :
                 
                 kml.write('<skipping sig="%s"/></field>\n' % signature)
                 return 
                 objvalue=jvmti.getObjectField(field.fieldid,objectid)
+                
                 if objvalue==0 : 
-                    arraylen=0
-                   
+                    kml.write('<null/>\n')
                 else :
                     arraylen=jvmti.getArrayLength(objvalue)
-                
-                kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
-                
-                if arraylen > 0 :
-                    for i in range (0 ,arraylen)  :
-                        elementID=jvmti.getObjectArrayElement(objvalue,i)
-                        if elementID==0 :
+                    kml.write('<string ref="%d" length="%d">\n' % (objvalue,arraylen))
+                    if arraylen > 0 :
+                        for i in range (0 ,arraylen)  :
+                            elementID=jvmti.getObjectArrayElement(objvalue,i)
+                            if elementID==0 :
                                 kml.write('<null/>\n')
-                        else :
-                            string=jvmti.getStringUTFChars(elementID)
-                            kml.write('<entry id="%d" value="%s"/>' % (elementID,string))
-                        
-                kml.write("</data>\n")
+                            else :
+                                string=jvmti.getStringUTFChars(elementID)
+                                kml.write('<entry id="%d" value="%s"/>' % (elementID,string))
+                    kml.write("</data>\n")
                 
                 
             elif signature[0]=='[' :
@@ -607,7 +396,7 @@
                 
                 kml.write('<data ref="%d" length="%d">\n' % (objvalue,arraylen))
                 if arraylen > 0 :
-                    data=array.array('i')
+                    data=arraybuilder.array('i')
                     for i in range (0 ,arraylen)  :
                         elementID=jvmti.getObjectArrayElement(objvalue,i)
                         data.append(elementID)
@@ -669,7 +458,7 @@
         writeMethod(kml,frame.method)
         
         
-        kml.write('<frame this="%d" methodid="%d" location="%d">\n' % (this,frame.methodID,frame.locationID))
+        kml.write('<frame this="%d" methodid="%d" location="%d" depth="%d">\n' % (this,frame.methodID,frame.locationID,depth))
         method=frame.method
         
         
@@ -698,26 +487,24 @@
     
 def writeMethod(kml,method):
     
-        if method.methodid  in methods :
+        if method.methodid  in savedmethods :
             return
         
-        methods.add(method.methodid)
-        
-        
-        kml.write('<method id="%d" name="%s" sig="%s" maxlocals="%d">\n' % (method.methodid,method.name,method.signature,method.maxlocals))
+        savedmethods.add(method.methodid)
         
         localvars=method.localVariableTable
-        
-        for var in localvars :
-             #LocalVariableTableEntry
-             kml.write('<var sig="%s" start="%d" length="%d" slot="%d"/>\n' % (var.signature,var.start,var.length,var.slot))
-        
-        
-        
-        kml.write("</method>\n")
+        if len(localvars)==0 :
+            kml.write('<method id="%d" name="%s" sig="%s" maxlocals="%d"/>\n' % (method.methodid,method.name,method.signature,method.maxlocals))
+        else :
+            kml.write('<method id="%d" name="%s" sig="%s" maxlocals="%d">\n' % (method.methodid,method.name,method.signature,method.maxlocals))
+            for var in localvars :
+                kml.write('<vardef sig="%s" start="%d" length="%d" slot="%d"/>\n' % (var.signature,var.start,var.length,var.slot))
+            kml.write("</method>\n")
         
 def writeHeader(kml):
-    kml.write("<kato>\n")
+    kml.write('<?xml version="1.0"?>\n')
+    kml.write('<kato xmlns="http://apache.org/kato/schema">\n')
+    
 
 def writeTrailer(kml):
     kml.write("</kato>")
@@ -726,229 +513,153 @@
      signature=entry.signature
      print "saving var " , signature
      
+     kml.write('<var slot="%d">\n' % entry.slot)
      
      try :
          
             if signature=='Z' :
                 boolvalue=jvmti.getLocalInt(threadid,depth,entry.slot)
-                kml.write('<localvar slot="%d" value="%d"/>\n' % (entry.slot,boolvalue))
+                kml.write('<bool value="%d"/>\n' % boolvalue)
             
             elif signature=='C' :
                 charvalue=jvmti.getLocalInt(threadid,depth,entry.slot)
-                kml.write('<localvar slot="%d" value="%c"/>\n' % (entry.slot,charvalue))
+                kml.write('<char value="%c"/>\n' % charvalue)
                 
             elif signature=='I' :
                 intvalue=jvmti.getLocalInt(threadid,depth,entry.slot)
-                kml.write('<localvar slot="%d" value="%d"/>\n' % (entry.slot,intvalue))
+                kml.write('<int value="%d"/>\n' % intvalue)
             
             elif signature=='B' :
                 bytevalue=jvmti.getLocalInt(threadid,depth,entry.slot)
-                kml.write('<localvar slot="%d" value="%d"/>\n' % (entry.slot,bytevalue))
+                kml.write('<byte value="%d"/>\n' % bytevalue)
             
             elif signature=='S' :
                 shortvalue=jvmti.getLocalInt(threadid,depth,entry.slot)
-                kml.write('<localvar slot="%d" value="%d"/>\n' % (entry.slot,shortvalue))
+                kml.write('<short value="%d"/>\n' % shortvalue)
             
             elif signature=='J' :
                 longvalue=jvmti.getLocalLong(threadid,depth,entry.slot)
-                kml.write('<localvar slot="%d" value="%d"/>\n' % (entry.slot,longvalue))
+                kml.write('<long value="%d"/>\n' % longvalue)
             
             elif signature=='Ljava/lang/String;' :
                 objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
                 if objvalue==0 :
-                    kml.write('<localvar slot="%d" nullvalue="true"/>\n' % entry.slot)
+                    kml.write('<null/>')
                 else :
                     string=jvmti.getStringUTFChars(objvalue)
-                    kml.write('<localvar slot="%d" value="%s"/>\n' % (entry.slot,string))
+                    kml.write('<string value="%s"/>\n' % string)
                 
             elif signature=='[C' :
                  
                   
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 chararray=jvmti.getCharArrayElements(objvalue)
-                 arraylen=len(chararray)
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                
-                 
-                 data=array.array('c')
-                 
-                 for element in chararray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")
+                 writeArray(kml,'char',objvalue)
                      
              
             elif signature=='[I' :
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 intarray=jvmti.getIntArrayElements(objvalue)
-                 arraylen=len(intarray)
-                 
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                 
-                 data=array.array('i')
-                 
-                 for element in intarray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")
+                 writeArray(kml,'int',objvalue)
                  
             
             elif signature=='[B' :
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 barray=jvmti.getByteArrayElements(objvalue)
-                 arraylen=len(barray)
-                 
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                 
-                 data=array.array('b')
-                 
-                 for element in barray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")
-                 
+                 writeArray(kml,'byte',objvalue)
+                      
             elif signature=='[Z' :
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 barray=jvmti.getBooleanArrayElements(objvalue)
-                 arraylen=len(barray)
-                 
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                 
-                 data=array.array('b')
-                 
-                 for element in barray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")     
-                
+                 writeArray(kml,'bool',objvalue)
+                                 
             elif signature=='[S' :
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 sarray=jvmti.getShortArrayElements(objvalue)
-                 arraylen=len(sarray)
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                 
-                 data=array.array('h')
-                 
-                 for element in sarray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")
-                 
+                 writeArray(kml,'short',objvalue)
                  
                  
             elif signature=='[J' :
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 larray=jvmti.getLongArrayElements(objvalue)
-                 arraylen=len(larray)
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                 
-                 data=array.array('l')
-                 
-                 for element in larray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")
-                 
-         
+                 writeArray(kml,'long',objvalue)
             
             elif signature=='[F' :
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 farray=jvmti.getFloatArrayElements(objvalue)
-                 arraylen=len(farray)
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                 
-                 data=array.array('f')
-                 
-                 for element in farray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")
-                 
+                 writeArray(kml,'float',objvalue)                 
                  
             
             elif signature=='[D' :
                  objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                 darray=jvmti.getDoubleArrayElements(objvalue)
-                 arraylen=len(darray)
-                 kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                 
-                 data=array.array('d')
-                 
-                 for element in darray :
-                     data.append(element)
-                 
-                 kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
-                     
-                 kml.write("</localvar>\n")
-                 
+                 writeArray(kml,'double',objvalue)
+                  
             elif signature=='[Ljava/lang/String;' :
                 
                 
                 objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
                 if objvalue==0 : 
-                    arraylen=0
+                    kml.write("<null/>");
                     
                 else :
                     arraylen=jvmti.getArrayLength(objvalue)
                 
-                kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
+                    kml.write('<string ref="%d" length="%d">\n' % (objvalue,arraylen))
                 
-                if arraylen > 0 :
-                    for i in range (0 ,arraylen)  :
-                        elementID=jvmti.getObjectArrayElement(objvalue,i)
-                        string=jvmti.getStringUTFChars(elementID)
-                        kml.write('<entry id="%d" value="%s"/>' % (elementID,string))
+                    if arraylen > 0 :
+                        for i in range (0 ,arraylen)  :
+                            elementID=jvmti.getObjectArrayElement(objvalue,i)
+                            string=jvmti.getStringUTFChars(elementID)
+                            kml.write('<entry id="%d" value="%s"/>' % (elementID,string))
                         
-                kml.write("</localvar>\n")
+                    kml.write("</string>\n")
                 
                 
             elif signature[0]=='[' :
                 objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
                 if objvalue==0 : 
-                    arraylen=0
-                    
+                    kml.write("<null/>");
                 else :
                     arraylen=jvmti.getArrayLength(objvalue)
+                    kml.write('<instance ref="%d" length="%d">\n' % (objvalue,arraylen))
                 
-                kml.write('<localvar slot="%d" ref="%d" length="%d">\n' % (entry.slot,objvalue,arraylen))
-                if arraylen > 0 :
-                    data=array.array('i')
-                    for i in range (0 ,arraylen)  :
-                        elementID=jvmti.getObjectArrayElement(objvalue,i)
-                        data.append(elementID)
-                    kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
+                    if arraylen > 0 :
+                        data=arraybuilder.array('i')
+                        for i in range (0 ,arraylen)  :
+                            elementID=jvmti.getObjectArrayElement(objvalue,i)
+                            data.append(elementID)
+                        kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
                         
-                kml.write("</localvar>\n")
+                    kml.write("</instance>\n")
                 
             else :
                 objvalue=jvmti.getLocalObject(threadid,depth,entry.slot)
-                
                 clazzid=0
-                if objvalue!=0 :
+                if objvalue==0 :
+                    kml.write("<null/>");
+                else :
                     clazzid=jvmti.getObjectClass(objvalue)
                     saveInstance(kml,clazzid,objvalue)
-
-                kml.write('<localvar slot="%d" classid="%d" object="%d">\n' % (entry.slot,clazzid,objvalue))
-                kml.write("</localvar>\n")
+                   # kml.write('<instance classid="%d" object="%d"/>\n' % (clazzid,objvalue))
+                    
                 
      except jvmti.error :
+            print "err..." , jvmti.error , signature
                 
-            
-                print "err..." , jvmti.error , signature
+     kml.write("</var>\n");
           
+def writeArray(kml,nodename,objvalue):
   
-    
+    if objvalue == 0 :
+       kml.write('<null/>\n')
+    else :
+       data=arraymap[nodename]
+       type=data[0]
+       func=data[1]
+       objarray=func(objvalue)
+      
+       arraylen=len(objarray)
+       
+       if arraylen >0 :
+           kml.write('<%s ref="%d" length="%d">\n' % (nodename,objvalue,arraylen))
+           data=arraybuilder.array(type)
+           for element in objarray :
+               data.append(element)
+           kml.write("<![CDATA[%s]]>\n" % base64.b64encode(data.tostring()))
+           kml.write('</%s>\n' % nodename)
+       else :
+           kml.write('<%s ref="%d" length="0"/>\n' % nodename)
+                 
\ No newline at end of file

Modified: incubator/kato/branches/experimental/PyJVMTI/pyjvmti.h
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/PyJVMTI/pyjvmti.h?rev=784668&r1=784667&r2=784668&view=diff
==============================================================================
--- incubator/kato/branches/experimental/PyJVMTI/pyjvmti.h (original)
+++ incubator/kato/branches/experimental/PyJVMTI/pyjvmti.h Mon Jun 15 06:27:55 2009
@@ -51,9 +51,15 @@
 		} \
 	}
 
+#ifdef DEBUG
 #define TRACE_ENTER()   printf(">%s\n",__FUNCTION__)
 #define TRACE(s,v)      printf(s,v)
 #define TRACE_EXIT()   printf("<%s\n",__FUNCTION__)
+#else
+#define TRACE_ENTER()
+#define TRACE(s,v)
+#define TRACE_EXIT()
+#endif
 
 #define report(s) printf("kato:%s\n",s);