truffle: agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java comparison

comparison agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java @ 6725:da91efe96a93

6964458: Reimplement class meta-data storage to use native memory Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>

author	coleenp
date	Sat, 01 Sep 2012 13:25:18 -0400
parents	a9fed06c01d2
children	5a98bf7d847b

comparison

equal deleted inserted replaced

-:36d1d483d5d6
+:da91efe96a93
 buf.append("] ");
 } else {
 buf.append(' ');
 }
 buf.append('@');
-buf.append(klass.getHandle().toString());
+buf.append(klass.getAddress().toString());
 return buf.toString();
 }
 protected String genBaseHref() {
 return "";
 }
 protected String genKlassHref(InstanceKlass klass) {
-return genBaseHref() + "klass=" + klass.getHandle();
+return genBaseHref() + "klass=" + klass.getAddress();
 }
 protected String genKlassLink(InstanceKlass klass) {
 Formatter buf = new Formatter(genHTML);
 buf.link(genKlassHref(klass), genKlassTitle(klass));
 protected String genMethodTitle(Method method) {
 Formatter buf = new Formatter(genHTML);
 buf.append(genMethodNameAndSignature(method));
 buf.append(' ');
 buf.append('@');
-buf.append(method.getHandle().toString());
+buf.append(method.getAddress().toString());
 return buf.toString();
 }
 protected String genMethodHref(Method m) {
-return genBaseHref() + "method=" + m.getHandle();
+return genBaseHref() + "method=" + m.getAddress();
 }
 protected String genMethodLink(Method m) {
 Formatter buf = new Formatter(genHTML);
 buf.link(genMethodHref(m), genMethodTitle(m));
 // zero'th pool entry is always invalid. ignore it.
 for (int index = 1; index < length; index++) {
 buf.beginTag("tr");
 buf.cell(Integer.toString(index));
-int ctag = (int) cpool.getTags().getByteAt((int) index);
+int ctag = (int) cpool.getTags().at((int) index);
 switch (ctag) {
 case JVM_CONSTANT_Integer:
 buf.cell("JVM_CONSTANT_Integer");
 buf.cell(Integer.toString(cpool.getIntAt(index)));
 break;
 index++;
 break;
 case JVM_CONSTANT_UnresolvedClass:
 buf.cell("JVM_CONSTANT_UnresolvedClass");
-buf.cell(cpool.getSymbolAt(index).asString());
+buf.cell(cpool.getKlassNameAt(index).asString());
 break;
 case JVM_CONSTANT_UnresolvedClassInError:
 buf.cell("JVM_CONSTANT_UnresolvedClassInError");
 buf.cell(cpool.getSymbolAt(index).asString());
 break;
 case JVM_CONSTANT_Class:
 buf.cell("JVM_CONSTANT_Class");
-Klass klass = (Klass) cpool.getObjAtRaw(index);
+Klass klass = (Klass) cpool.getKlassAt(index);
 if (klass instanceof InstanceKlass) {
 buf.cell(genKlassLink((InstanceKlass) klass));
 } else {
 buf.cell(klass.getName().asString().replace('/', '.'));
 }
 break;
-case JVM_CONSTANT_UnresolvedString:
-buf.cell("JVM_CONSTANT_UnresolvedString");
-buf.cell("\"" +
-escapeHTMLSpecialChars(cpool.getSymbolAt(index).asString()) +
-"\"");
-break;
 case JVM_CONSTANT_Utf8:
 buf.cell("JVM_CONSTANT_Utf8");
 buf.cell("\"" +
 escapeHTMLSpecialChars(cpool.getSymbolAt(index).asString()) +
 "\"");
 break;
 case JVM_CONSTANT_String:
 buf.cell("JVM_CONSTANT_String");
 buf.cell("\"" +
-escapeHTMLSpecialChars(OopUtilities.stringOopToString(cpool.getObjAtRaw(index))) + "\"");
+escapeHTMLSpecialChars(cpool.getUnresolvedStringAt(index).asString()) + "\"");
 break;
 case JVM_CONSTANT_Fieldref:
 buf.cell("JVM_CONSTANT_Fieldref");
 buf.cell(genLowHighShort(cpool.getIntAt(index)));
 return genHTMLErrorMessage(exp);
 }
 }
 protected String genConstantPoolHref(ConstantPool cpool) {
-return genBaseHref() + "cpool=" + cpool.getHandle();
+return genBaseHref() + "cpool=" + cpool.getAddress();
 }
 protected String genConstantPoolTitle(ConstantPool cpool) {
 Formatter buf = new Formatter(genHTML);
 buf.append("Constant Pool of [");
 buf.append(genKlassTitle((InstanceKlass) cpool.getPoolHolder()));
 buf.append("] @");
-buf.append(cpool.getHandle().toString());
+buf.append(cpool.getAddress().toString());
 return buf.toString();
 }
 protected String genConstantPoolLink(ConstantPool cpool) {
 Formatter buf = new Formatter(genHTML);
 CheckedExceptionElement[] exceptions = method.getCheckedExceptions();
 buf.beginTag("ul");
 for (int exp = 0; exp < exceptions.length; exp++) {
 short cpIndex = (short) exceptions[exp].getClassCPIndex();
 ConstantPool.CPSlot obj = cpool.getSlotAt(cpIndex);
-if (obj.isMetaData()) {
+if (obj.isUnresolved()) {
 buf.li((obj.getSymbol()).asString().replace('/', '.'));
 } else {
-buf.li(genKlassLink((InstanceKlass)obj.getOop()));
+buf.li(genKlassLink((InstanceKlass)obj.getKlass()));
 }
 }
 buf.endTag("ul");
 }
 buf.beginTag("td");
 String instrStr = null;
 try {
 instrStr = escapeHTMLSpecialChars(instr.toString());
 } catch (RuntimeException re) {
-buf.append("exception during bytecode processing");
+buf.append("exception while printing " + instr.getBytecodeName());
 buf.endTag("td");
 buf.endTag("tr");
 re.printStackTrace();
 return;
 }
 }
 } else if (instr instanceof BytecodeLoadConstant) {
 BytecodeLoadConstant ldc = (BytecodeLoadConstant) instr;
 if (ldc.isKlassConstant()) {
 Object oop = ldc.getKlass();
-if (oop instanceof Klass) {
+if (oop instanceof InstanceKlass) {
 buf.append("<a href='");
 buf.append(genKlassHref((InstanceKlass) oop));
 buf.append("'>");
 buf.append(instrStr);
 buf.append("</a>");
 buf.cell(Integer.toString(exceptionTable[e].getHandlerPC()));
 short cpIndex = (short) exceptionTable[e].getCatchTypeIndex();
 ConstantPool.CPSlot obj = cpIndex == 0? null : cpool.getSlotAt(cpIndex);
 if (obj == null) {
 buf.cell("Any");
-} else if (obj.isMetaData()) {
+} else if (obj.isUnresolved()) {
 buf.cell(obj.getSymbol().asString().replace('/', '.'));
 } else {
-buf.cell(genKlassLink((InstanceKlass)obj.getOop()));
+buf.cell(genKlassLink((InstanceKlass)obj.getKlass()));
 }
 buf.endTag("tr");
 }
 buf.endTable();
 protected SymbolFinder createSymbolFinder() {
 return new DummySymbolFinder();
 }
 // genHTML for a given address. Address may be a PC or
-// methodOop or klassOop.
+// Method* or Klass*.
 public String genHTMLForAddress(String addrStr) {
 return genHTML(parseAddress(addrStr));
 }
 } else if (VM.getVM().getCodeCache().contains(pc)) {
 return "Unknown location in the CodeCache: " + pc;
 }
 // did not find nmethod.
-// try methodOop, klassOop and constantPoolOop.
+// try Method*, Klass* and ConstantPool*.
 try {
-Oop obj = getOopAtAddress(pc);
+Metadata obj = Metadata.instantiateWrapperFor(pc);
 if (obj != null) {
 if (obj instanceof Method) {
 return genHTML((Method) obj);
 } else if (obj instanceof InstanceKlass) {
 return genHTML((InstanceKlass) obj);
 } else if (obj instanceof ConstantPool) {
 return genHTML((ConstantPool) obj);
 }
 }
 } catch (Exception exp) {
+exp.printStackTrace();
 // ignore
 }
 // didn't find any. do raw disassembly.
 return genHTMLForRawDisassembly(pc, null);
 OopHandle klHandle = klv.getValue();
 if (Assert.ASSERTS_ENABLED) {
 Assert.that(klHandle != null, "scalar replaced object klass must be not NULL");
 }
 Oop obj = VM.getVM().getObjectHeap().newOop(klHandle);
-if (obj instanceof InstanceKlass) {
+// Obj is a Java mirror
-InstanceKlass kls = (InstanceKlass) obj;
+Klass klass = java_lang_Class.asKlass(obj);
+if (klass instanceof InstanceKlass) {
+InstanceKlass kls = (InstanceKlass) klass;
 buf.append(" " + kls.getName().asString() + "={");
 int flen = ov.fieldsSize();
-int klen = kls.getJavaFieldsCount();
+U2Array klfields = kls.getFields();
+int klen = (int) klfields.length();
 int findex = 0;
 for (int index = 0; index < klen; index++) {
 int accsFlags = kls.getFieldAccessFlags(index);
 Symbol f_name = kls.getFieldName(index);
 AccessFlags access = new AccessFlags(accsFlags);
 }
 buf.append(" }");
 } else {
 buf.append(" ");
 int flen = ov.fieldsSize();
-if (obj instanceof TypeArrayKlass) {
+if (klass instanceof TypeArrayKlass) {
-TypeArrayKlass kls = (TypeArrayKlass) obj;
+TypeArrayKlass kls = (TypeArrayKlass) klass;
 buf.append(kls.getElementTypeName() + "[" + flen + "]");
-} else if (obj instanceof ObjArrayKlass) {
+} else if (klass instanceof ObjArrayKlass) {
-ObjArrayKlass kls = (ObjArrayKlass) obj;
+ObjArrayKlass kls = (ObjArrayKlass) klass;
 Klass elobj = kls.getBottomKlass();
 if (elobj instanceof InstanceKlass) {
 buf.append(elobj.getName().asString());
 } else if (elobj instanceof TypeArrayKlass) {
 TypeArrayKlass elkls = (TypeArrayKlass) elobj;
 protected String genDumpKlassesHref(InstanceKlass[] klasses) {
 StringBuffer buf = new StringBuffer(genBaseHref());
 buf.append("jcore_multiple=");
 for (int k = 0; k < klasses.length; k++) {
-buf.append(klasses[k].getHandle().toString());
+buf.append(klasses[k].getAddress().toString());
 buf.append(',');
 }
 return buf.toString();
 }
 }
 }
 protected String genHTMLListForMethods(InstanceKlass klass) {
 Formatter buf = new Formatter(genHTML);
-ObjArray methods = klass.getMethods();
+MethodArray methods = klass.getMethods();
-int numMethods = (int) methods.getLength();
+int numMethods = methods.length();
 if (numMethods != 0) {
 buf.h3("Methods");
 buf.beginTag("ul");
 for (int m = 0; m < numMethods; m++) {
-Method mtd = (Method) methods.getObjAt(m);
+Method mtd = methods.at(m);
 buf.li(genMethodLink(mtd) + ";");
 }
 buf.endTag("ul");
 }
 return buf.toString();
 }
 protected String genHTMLListForInterfaces(InstanceKlass klass) {
 try {
 Formatter buf = new Formatter(genHTML);
-ObjArray interfaces = klass.getLocalInterfaces();
+KlassArray interfaces = klass.getLocalInterfaces();
-int numInterfaces = (int) interfaces.getLength();
+int numInterfaces = interfaces.length();
 if (numInterfaces != 0) {
 buf.h3("Interfaces");
 buf.beginTag("ul");
 for (int i = 0; i < numInterfaces; i++) {
-InstanceKlass inf = (InstanceKlass) interfaces.getObjAt(i);
+InstanceKlass inf = (InstanceKlass) interfaces.getAt(i);
 buf.li(genKlassLink(inf));
 }
 buf.endTag("ul");
 }
 return buf.toString();
 }
 }
 protected String genHTMLListForFields(InstanceKlass klass) {
 Formatter buf = new Formatter(genHTML);
-int numFields = klass.getJavaFieldsCount();
+U2Array fields = klass.getFields();
+int numFields = klass.getAllFieldsCount();
 if (numFields != 0) {
 buf.h3("Fields");
 buf.beginList();
 for (int f = 0; f < numFields; f++) {
 sun.jvm.hotspot.oops.Field field = klass.getFieldByIndex(f);
 }
 return buf.toString();
 }
 protected String genKlassHierarchyHref(InstanceKlass klass) {
-return genBaseHref() + "hierarchy=" + klass.getHandle();
+return genBaseHref() + "hierarchy=" + klass.getAddress();
 }
 protected String genKlassHierarchyTitle(InstanceKlass klass) {
 Formatter buf = new Formatter(genHTML);
 buf.append("Class Hierarchy of ");
 buf.genHTMLEpilogue();
 return buf.toString();
 }
 protected String genDumpKlassHref(InstanceKlass klass) {
-return genBaseHref() + "jcore=" + klass.getHandle();
+return genBaseHref() + "jcore=" + klass.getAddress();
 }
 protected String genDumpKlassLink(InstanceKlass klass) {
 if (!genHTML) return "";
 }
 protected Oop getOopAtAddress(String address) {
 sun.jvm.hotspot.debugger.Address addr = parseAddress(address);
 return getOopAtAddress(addr);
+}
+protected Klass getKlassAtAddress(String address) {
+sun.jvm.hotspot.debugger.Address addr = parseAddress(address);
+return (Klass)Metadata.instantiateWrapperFor(addr);
+}
+protected Method getMethodAtAddress(String address) {
+sun.jvm.hotspot.debugger.Address addr = parseAddress(address);
+return (Method)Metadata.instantiateWrapperFor(addr);
+}
+protected ConstantPool getConstantPoolAtAddress(String address) {
+sun.jvm.hotspot.debugger.Address addr = parseAddress(address);
+return (ConstantPool) Metadata.instantiateWrapperFor(addr);
 }
 private void dumpKlass(InstanceKlass kls) throws IOException {
 String klassName = kls.getName().asString();
 klassName = klassName.replace('/', File.separatorChar);
 }
 public String genHTMLForHyperlink(String href) {
 if (href.startsWith("klass=")) {
 href = href.substring(href.indexOf('=') + 1);
-Oop obj = getOopAtAddress(href);
+Klass k = getKlassAtAddress(href);
 if (Assert.ASSERTS_ENABLED) {
-Assert.that(obj instanceof InstanceKlass, "class= href with improper InstanceKlass!");
+Assert.that(k instanceof InstanceKlass, "class= href with improper InstanceKlass!");
 }
-return genHTML((InstanceKlass) obj);
+return genHTML((InstanceKlass) k);
 } else if (href.startsWith("method=")) {
 href = href.substring(href.indexOf('=') + 1);
-Oop obj = getOopAtAddress(href);
+Method obj = getMethodAtAddress(href);
 if (Assert.ASSERTS_ENABLED) {
 Assert.that(obj instanceof Method, "method= href with improper Method!");
 }
-return genHTML((Method) obj);
+return genHTML(obj);
 } else if (href.startsWith("nmethod=")) {
 String addr = href.substring(href.indexOf('=') + 1);
 Object obj = VMObjectFactory.newObject(NMethod.class, parseAddress(addr));
 if (Assert.ASSERTS_ENABLED) {
 Assert.that(obj instanceof NMethod, "nmethod= href with improper NMethod!");
 }
 } else if (href.startsWith("interp_codelets")) {
 return genInterpreterCodeletLinksPage();
 } else if (href.startsWith("hierarchy=")) {
 href = href.substring(href.indexOf('=') + 1);
-Oop obj = getOopAtAddress(href);
+Klass obj = getKlassAtAddress(href);
 if (Assert.ASSERTS_ENABLED) {
 Assert.that(obj instanceof InstanceKlass, "class= href with improper InstanceKlass!");
 }
 return genHTMLForKlassHierarchy((InstanceKlass) obj);
 } else if (href.startsWith("cpool=")) {
 href = href.substring(href.indexOf('=') + 1);
-Oop obj = getOopAtAddress(href);
+ConstantPool obj = getConstantPoolAtAddress(href);
 if (Assert.ASSERTS_ENABLED) {
 Assert.that(obj instanceof ConstantPool, "cpool= href with improper ConstantPool!");
 }
-return genHTML((ConstantPool) obj);
+return genHTML(obj);
 } else if (href.startsWith("jcore=")) {
 href = href.substring(href.indexOf('=') + 1);
-Oop obj = getOopAtAddress(href);
+Klass obj = getKlassAtAddress(href);
 if (Assert.ASSERTS_ENABLED) {
 Assert.that(obj instanceof InstanceKlass, "jcore= href with improper InstanceKlass!");
 }
 return genDumpKlass((InstanceKlass) obj);
 } else if (href.startsWith("jcore_multiple=")) {
 href = href.substring(href.indexOf('=') + 1);
 Formatter buf = new Formatter(genHTML);
 buf.genHTMLPrologue();
 StringTokenizer st = new StringTokenizer(href, ",");
 while (st.hasMoreTokens()) {
-Oop obj = getOopAtAddress(st.nextToken());
+Klass obj = getKlassAtAddress(st.nextToken());
 if (Assert.ASSERTS_ENABLED) {
 Assert.that(obj instanceof InstanceKlass, "jcore_multiple= href with improper InstanceKlass!");
 }
 InstanceKlass kls = (InstanceKlass) obj;

Mercurial > hg > truffle

comparison agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java @ 6725:da91efe96a93