truffle: agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js comparison

comparison agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js @ 12097:e37ab280bbce

8011888: sa.js: TypeError: [object JSAdapter] has no such function "__has__" Reviewed-by: sla, sundar, kmo Contributed-by: yunda.mly@taobao.com

author	allwin
date	Tue, 23 Jul 2013 14:32:37 +0200
parents	5ed317b25e23
children	de6a9e811145

comparison

equal deleted inserted replaced

-:c6ec0a97b30a
+:e37ab280bbce
 sapkg.asm = sapkg.hotspot.asm;
 sapkg.c1 = sapkg.hotspot.c1;
 sapkg.code = sapkg.hotspot.code;
 sapkg.compiler = sapkg.hotspot.compiler;
-// 'debugger' is a JavaScript keyword :-(
+// 'debugger' is a JavaScript keyword, but ES5 relaxes the
-// sapkg.debugger = sapkg.hotspot.debugger;
+// restriction of using keywords as property name
+sapkg.debugger = sapkg.hotspot.debugger;
 sapkg.interpreter = sapkg.hotspot.interpreter;
 sapkg.jdi = sapkg.hotspot.jdi;
 sapkg.memory = sapkg.hotspot.memory;
 sapkg.oops = sapkg.hotspot.oops;
 }
 }
 return args;
 }
+// Handle __has__ specially to avoid metacircularity problems
+// when called from __get__.
+// Calling
+//   this.__has__(name)
+// will in turn call
+//   this.__call__('__has__', name)
+// which is not handled below
+function __has__(name) {
+if (typeof(name) == 'number') {
+return so["has(int)"](name);
+} else {
+if (name == '__wrapped__') {
+return true;
+} else if (so["has(java.lang.String)"](name)) {
+return true;
+} else if (name.equals('toString')) {
+return true;
+} else {
+return false;
+}
+}
+}
 if (so instanceof sapkg.utilities.soql.ScriptObject) {
 return new JSAdapter() {
 __getIds__: function() {
 return so.getIds();
 },
-__has__ : function(name) {
+__has__ : __has__,
-if (typeof(name) == 'number') {
-return so["has(int)"](name);
-} else {
-if (name == '__wrapped__') {
-return true;
-} else if (so["has(java.lang.String)"](name)) {
-return true;
-} else if (name.equals('toString')) {
-return true;
-} else {
-return false;
-}
-}
-},
 __delete__ : function(name) {
 if (typeof(name) == 'number') {
 return so["delete(int)"](name);
 } else {
 return so["delete(java.lang.String)"](name);
 }
 },
 __get__ : function(name) {
-if (! this.__has__(name)) {
+	      // don't call this.__has__(name); see comments above function __has__
+if (! __has__.call(this, name)) {
 return undefined;
 }
 if (typeof(name) == 'number') {
 return wrapScriptObject(so["get(int)"](name));
 } else {
 if (value instanceof sapkg.utilities.soql.Callable) {
 return function() {
 var args = prepareArgsArray(arguments);
 var r;
 try {
-r = value.call(args);
+r = value.call(Java.to(args, 'java.lang.Object[]'));
 } catch (e) {
 println("call to " + name + " failed!");
 throw e;
 }
 return wrapScriptObject(r);
 this[prop] = globals[prop];
 }
 }
 // define "writeln" and "write" if not defined
+if (typeof(println) == 'undefined') {
+println = function (str) {
+java.lang.System.out.println(String(str));
+}
+}
+if (typeof(print) == 'undefined') {
+print = function (str) {
+java.lang.System.out.print(String(str));
+}
+}
 if (typeof(writeln) == 'undefined') {
 writeln = println;
 }
 if (typeof(write) == 'undefined') {
 }
 registerCommand("class", "class name", "jclass");
 this.jclasses = function() {
 forEachKlass(function (clazz) {
-writeln(clazz.getName().asString() + " @" + clazz.getHandle().toString());
+writeln(clazz.getName().asString() + " @" + clazz.getAddress().toString());
 });
 }
 registerCommand("classes", "classes", "jclasses");
 this.dclass = function(clazz, dir) {
 // iterate system dictionary for each 'Klass'
 function forEachKlass(callback) {
 var VisitorClass = sapkg.memory.SystemDictionary.ClassVisitor;
 var visitor = new VisitorClass() { visit: callback };
-sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary$ClassVisitor)"](visitor);
+sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary.ClassVisitor)"](visitor);
 }
 // iterate system dictionary for each 'Klass' and initiating loader
 function forEachKlassAndLoader(callback) {
 var VisitorClass = sapkg.memory.SystemDictionary.ClassAndLoaderVisitor;
 var visitor = new VisitorClass() { visit: callback };
-sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary$ClassAndLoaderVisitor)"](visitor);
+sa.sysDict["classesDo(sun.jvm.hotspot.memory.SystemDictionary.ClassAndLoaderVisitor)"](visitor);
 }
 // iterate system dictionary for each primitive array klass
 function forEachPrimArrayKlass(callback) {
 var VisitorClass = sapkg.memory.SystemDictionary.ClassAndLoaderVisitor;
 // Java heap iteration
 // iterates Java heap for each Oop
 function forEachOop(callback) {
-sa.objHeap.iterate(new sapkg.oops.HeapVisitor() { doObj: callback });
+function empty() { }
+sa.objHeap.iterate(new sapkg.oops.HeapVisitor() {
+prologue: empty,
+doObj: callback,
+epilogue: empty
+});
 }
 // iterates Java heap for each Oop of given 'klass'.
 // 'includeSubtypes' tells whether to include objects
 // of subtypes of 'klass' or not
 }
 if (includeSubtypes == undefined) {
 includeSubtypes = true;
 }
+function empty() { }
 sa.objHeap.iterateObjectsOfKlass(
-new sapkg.oops.HeapVisitor() { doObj: callback },
+new sapkg.oops.HeapVisitor() {
+prologue: empty,
+doObj: callback,
+epilogue: empty
+},
 klass, includeSubtypes);
 }
 // Java thread
 tmp.name.equals('address') ||
 tmp.name.equals("<opaque>")) {
 // ignore;
 continue;
 } else {
-// some type names have ':'. replace to make it as a
+// some type names have ':', '<', '>', '*', ' '. replace to make it as a
 // JavaScript identifier
-tmp.name = tmp.name.replace(':', '_').replace('<', '_').replace('>', '_').replace('*', '_').replace(' ', '_');
+tmp.name = ("" + tmp.name).replace(/[:<>* ]/g, '_');
 eval("function read" + tmp.name + "(addr) {" +
 "   return readVMType('" + tmp.name + "', addr);}");
 eval("function print" + tmp.name + "(addr) {" +
 "   printVMType('" + tmp.name + "', addr); }");