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/10/21 10:29:59 UTC
svn commit: r827952 [7/7] - in
/incubator/kato/branches/experimental/thirdview/org.apache.kato:
kato.api/src/main/java/javax/tools/diagnostics/
kato.api/src/main/java/javax/tools/diagnostics/image/
kato.api/src/main/java/javax/tools/diagnostics/runtime...
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/JavaRuntimeVisitor.java Wed Oct 21 10:29:55 2009
@@ -14,12 +14,12 @@
package org.apache.kato.katoview.commands.helpers;
import javax.tools.diagnostics.image.DiagnosticException;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
/**
* Passed to methods to visit all runtimes in an image.
*
*/
public interface JavaRuntimeVisitor {
- public void visit(JavaRuntime runtime) throws DiagnosticException;
+ public void visit(JVMRuntime runtime) throws DiagnosticException;
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/KatoSearch.java Wed Oct 21 10:29:55 2009
@@ -24,16 +24,16 @@
import javax.tools.diagnostics.image.ImageAddressSpace;
import javax.tools.diagnostics.image.ImageProcess;
import javax.tools.diagnostics.image.DiagnosticException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
/**
@@ -76,8 +76,8 @@
continue;
}
- if (nextRuntime instanceof JavaRuntime) {
- JavaRuntime runtime = (JavaRuntime) nextRuntime;
+ if (nextRuntime instanceof JVMRuntime) {
+ JVMRuntime runtime = (JVMRuntime) nextRuntime;
visitor.visit(runtime);
}
@@ -94,7 +94,7 @@
* @param name name of class to search for
* @return JavaClass or null if class not found.
*/
- public static JavaClass findClass(JavaRuntime runtime, String name) {
+ public static JVMClass findClass(JVMRuntime runtime, String name) {
List classLoaders = runtime.getJavaClassLoaders();
@@ -103,7 +103,7 @@
continue;
}
- JavaClassLoader loader = (JavaClassLoader) nextLoader;
+ JVMClassLoader loader = (JVMClassLoader) nextLoader;
List classes = loader.getDefinedClasses();
@@ -113,7 +113,7 @@
continue;
}
- JavaClass clazz = (JavaClass) nextClazz;
+ JVMClass clazz = (JVMClass) nextClazz;
try {
if (name.equals(clazz.getName())) {
@@ -135,7 +135,7 @@
* @param visitor
* @throws DiagnosticException
*/
- public static void visitClasses(JavaRuntime runtime, JavaClassVisitor visitor) {
+ public static void visitClasses(JVMRuntime runtime, JavaClassVisitor visitor) {
List classLoaders = runtime.getJavaClassLoaders();
CLASSLOADERS:
@@ -144,7 +144,7 @@
continue;
}
- JavaClassLoader loader = (JavaClassLoader) nextLoader;
+ JVMClassLoader loader = (JVMClassLoader) nextLoader;
List classes = loader.getDefinedClasses();
@@ -154,7 +154,7 @@
continue;
}
- JavaClass clazz = (JavaClass) nextClazz;
+ JVMClass clazz = (JVMClass) nextClazz;
try {
boolean rc = visitor.visit(clazz);
if (rc == false) {
@@ -176,7 +176,7 @@
* @param name name of field to retrieve.
* @return JavaField if found, else returns null.
*/
- public static JavaField getField(JavaClass clazz, String name) {
+ public static JVMField getField(JVMClass clazz, String name) {
while(clazz != null) {
List fields = clazz.getDeclaredFields();
@@ -187,7 +187,7 @@
break;
}
- JavaField field = (JavaField) nextField;
+ JVMField field = (JVMField) nextField;
try {
if (name.equals(field.getName())) {
return field;
@@ -213,8 +213,8 @@
* @param clazz
* @return
*/
- public static List<JavaObject> findInstances(JavaRuntime runtime, JavaClass clazz) {
- LinkedList<JavaObject> instances = new LinkedList<JavaObject>();
+ public static List<JVMObject> findInstances(JVMRuntime runtime, JVMClass clazz) {
+ LinkedList<JVMObject> instances = new LinkedList<JVMObject>();
InstanceFinder finder = new InstanceFinder(instances, clazz);
visitObjects(runtime, finder);
@@ -228,15 +228,15 @@
*
*/
private static class InstanceFinder implements JavaObjectVisitor {
- private JavaClass clazz;
- private List<JavaObject> list;
+ private JVMClass clazz;
+ private List<JVMObject> list;
- public InstanceFinder(List<JavaObject> list, JavaClass clazz) {
+ public InstanceFinder(List<JVMObject> list, JVMClass clazz) {
this.list = list;
this.clazz = clazz;
}
- public boolean visit(JavaObject object) throws DiagnosticException {
+ public boolean visit(JVMObject object) throws DiagnosticException {
if (clazz.equals(object.getJavaClass())) {
list.add(object);
}
@@ -254,8 +254,8 @@
* @param className name o
* @return List of JavaClasses
*/
- public static List<JavaClass> findClasses(JavaRuntime runtime, String className) {
- LinkedList<JavaClass> list = new LinkedList<JavaClass>();
+ public static List<JVMClass> findClasses(JVMRuntime runtime, String className) {
+ LinkedList<JVMClass> list = new LinkedList<JVMClass>();
SubclassFinder finder = new SubclassFinder(className, list);
@@ -270,9 +270,9 @@
*/
private static class SubclassFinder implements JavaClassVisitor {
private String clazzName;
- private List<JavaClass> list;
+ private List<JVMClass> list;
- public SubclassFinder(String name, List<JavaClass> list) {
+ public SubclassFinder(String name, List<JVMClass> list) {
if (name == null) {
throw new IllegalArgumentException("Cannot accept null class name");
}
@@ -280,8 +280,8 @@
this.list = list;
}
- public boolean visit(JavaClass clazz) throws DiagnosticException {
- JavaClass subClass = clazz;
+ public boolean visit(JVMClass clazz) throws DiagnosticException {
+ JVMClass subClass = clazz;
while((clazz != null)
&& !(clazzName.equals(clazz.getName()))) {
clazz = clazz.getSuperclass();
@@ -304,7 +304,7 @@
* @param runtime JavaRuntime whose objects are being visited
* @param visitor Visitor to execute against each object.
*/
- public static void visitObjects(JavaRuntime runtime, JavaObjectVisitor visitor) {
+ public static void visitObjects(JVMRuntime runtime, JavaObjectVisitor visitor) {
Iterator heaps = runtime.getHeaps().iterator();
while (heaps.hasNext()) {
@@ -314,7 +314,7 @@
continue;
}
- JavaHeap heap = (JavaHeap) nextHeap;
+ JVMHeap heap = (JVMHeap) nextHeap;
Iterator objects = heap.getObjects().iterator();
@@ -325,7 +325,7 @@
continue;
}
- JavaObject object = (JavaObject) nextObject;
+ JVMObject object = (JVMObject) nextObject;
try {
boolean rc = visitor.visit(object);
@@ -347,15 +347,15 @@
* @param clazz JavaClass to look for
* @return List of JavaThreads
*/
- public static List<JavaThread> findClassInThreads(JavaRuntime runtime, JavaClass clazz) {
- List<JavaThread> list = new LinkedList<JavaThread>();
+ public static List<JVMThread> findClassInThreads(JVMRuntime runtime, JVMClass clazz) {
+ List<JVMThread> list = new LinkedList<JVMThread>();
for (Object nextThread : runtime.getThreads()) {
if (nextThread instanceof CorruptData) {
continue;
}
- JavaThread thread = (JavaThread) nextThread;
+ JVMThread thread = (JVMThread) nextThread;
// Iterate over all frames. If method is in passed class, add it to the list.
FRAMES: for (Object nextFrame : thread.getStackFrames()) {
@@ -363,9 +363,9 @@
continue;
}
- JavaStackFrame frame = (JavaStackFrame) nextFrame;
+ JVMStackFrame frame = (JVMStackFrame) nextFrame;
- JavaLocation location;
+ JVMLocation location;
try {
location = frame.getLocation();
} catch (CorruptDataException e) {
@@ -374,7 +374,7 @@
if (location != null) {
try {
- JavaMethod method = location.getMethod();
+ JVMMethod method = location.getMethod();
if (clazz.equals(method.getDeclaringClass())) {
list.add(thread);
break FRAMES;
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorNode.java Wed Oct 21 10:29:55 2009
@@ -13,7 +13,7 @@
******************************************************************************/
package org.apache.kato.katoview.commands.helpers;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
public class MonitorNode {
@@ -22,13 +22,13 @@
public static final int LOOP_DEADLOCK = 2;
public static final int BRANCH_DEADLOCK = 3;
- private JavaMonitor monitor;
+ private JVMMonitor monitor;
public int visit;
public MonitorNode waitingOn;
public int deadlock;
public NodeList inList;
- public MonitorNode(JavaMonitor _monitor)
+ public MonitorNode(JVMMonitor _monitor)
{
monitor = _monitor;
visit = 0;
@@ -37,7 +37,7 @@
inList = null;
}
- public JavaMonitor getMonitor()
+ public JVMMonitor getMonitor()
{
return monitor;
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/MonitorState.java Wed Oct 21 10:29:55 2009
@@ -13,23 +13,23 @@
******************************************************************************/
package org.apache.kato.katoview.commands.helpers;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
public class MonitorState {
public static int WAITING_TO_ENTER = 1;
public static int WAITING_TO_BE_NOTIFIED_ON = 2;
- private JavaMonitor jm;
+ private JVMMonitor jm;
private int status;
- public MonitorState(JavaMonitor _jm, int _status)
+ public MonitorState(JVMMonitor _jm, int _status)
{
jm = _jm;
status = _status;
}
- public JavaMonitor getMonitor()
+ public JVMMonitor getMonitor()
{
return jm;
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/NodeList.java Wed Oct 21 10:29:55 2009
@@ -14,8 +14,8 @@
package org.apache.kato.katoview.commands.helpers;
import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMThread;
public class NodeList {
@@ -112,8 +112,8 @@
do {
String name = "";
String objAddr = "";
- JavaObject object = null;
- JavaThread owner = null;
+ JVMObject object = null;
+ JVMThread owner = null;
try {
owner = currNode.getMonitor().getOwner();
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/ThreadData.java Wed Oct 21 10:29:55 2009
@@ -13,24 +13,24 @@
******************************************************************************/
package org.apache.kato.katoview.commands.helpers;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMThread;
public class ThreadData {
- private JavaThread jt;
- private JavaRuntime jr;
+ private JVMThread jt;
+ private JVMRuntime jr;
- public ThreadData(JavaThread _jt, JavaRuntime _jr) {
+ public ThreadData(JVMThread _jt, JVMRuntime _jr) {
jt = _jt;
jr = _jr;
}
- public JavaThread getThread() {
+ public JVMThread getThread() {
return jt;
}
- public JavaRuntime getRuntime() {
+ public JVMRuntime getRuntime() {
return jr;
}
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/helpers/Utils.java Wed Oct 21 10:29:55 2009
@@ -30,11 +30,11 @@
import javax.tools.diagnostics.image.ImageProcess;
import javax.tools.diagnostics.image.MemoryAccessException;
import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
@@ -442,7 +442,7 @@
// note: this method lets you pass in a null JavaObject, but it _will_ throw a
// NullPointerException if the JavaField is not a static field when you pass it
// a null JavaObject; this is the behavior of jf.get() and jf.getString()
- public static String getVal(JavaObject jo, JavaField jf)
+ public static String getVal(JVMObject jo, JVMField jf)
{
Object o;
String s;
@@ -523,8 +523,8 @@
value = new Long((new Short(s)).longValue());
} else if (o instanceof String) {
val += (String)o;
- } else if (o instanceof JavaObject) {
- if (Utils.isNull((JavaObject)o)) {
+ } else if (o instanceof JVMObject) {
+ if (Utils.isNull((JVMObject)o)) {
val += "null";
} else {
object = true;
@@ -537,8 +537,8 @@
// because we want control over the exceptions that are thrown
if (object)
{
- JavaObject joField = (JavaObject)o;
- JavaClass jcField;
+ JVMObject joField = (JVMObject)o;
+ JVMClass jcField;
String jcName;
try {
@@ -585,9 +585,9 @@
return val;
}
- private static String getStringVal(JavaObject jo)
+ private static String getStringVal(JVMObject jo)
{
- JavaClass jc;
+ JVMClass jc;
try {
jc = jo.getJavaClass();
@@ -597,10 +597,10 @@
}
Iterator itJavaField = jc.getDeclaredFields().iterator();
- JavaField jf = null;
+ JVMField jf = null;
while (itJavaField.hasNext())
{
- jf = (JavaField)itJavaField.next();
+ jf = (JVMField)itJavaField.next();
try {
if (jf.getSignature().equals("[C") && !Modifier.isStatic(jf.getModifiers()))
break;
@@ -609,9 +609,9 @@
}
}
- JavaObject charArray = null;
+ JVMObject charArray = null;
try {
- charArray = (JavaObject)jf.get(jo);
+ charArray = (JVMObject)jf.get(jo);
} catch (CorruptDataException e) {
return "<cannot get char array out of String (" +
Exceptions.getCorruptDataExceptionString() + ")>";
@@ -753,7 +753,7 @@
return retval;
}
- public static boolean isNull(JavaObject jo)
+ public static boolean isNull(JVMObject jo)
{
return jo.getID().getAddress() == 0;
}
@@ -779,19 +779,19 @@
return output;
}
- public static JavaClass getClassGivenName(String className, JavaRuntime jr, Output out)
+ public static JVMClass getClassGivenName(String className, JVMRuntime jr, Output out)
{
Iterator itJavaClassLoader = jr.getJavaClassLoaders().iterator();
boolean found = false;
- JavaClass jc = null;
+ JVMClass jc = null;
while (itJavaClassLoader.hasNext() && !found)
{
- JavaClassLoader jcl = (JavaClassLoader)itJavaClassLoader.next();
+ JVMClassLoader jcl = (JVMClassLoader)itJavaClassLoader.next();
Iterator itJavaClass = jcl.getDefinedClasses().iterator();
while (itJavaClass.hasNext() && !found)
{
- jc = (JavaClass)itJavaClass.next();
+ jc = (JVMClass)itJavaClass.next();
String currClassName;
try {
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoClassCommand.java Wed Oct 21 10:29:55 2009
@@ -22,11 +22,11 @@
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -88,19 +88,19 @@
out.print("\n");
while (itRuntime.hasNext()) {
mr = (ManagedRuntime)itRuntime.next();
- if (mr instanceof JavaRuntime)
+ if (mr instanceof JVMRuntime)
{
out.print("Runtime #" + count + ": \n\n");
- printRuntimeClass((JavaRuntime)mr, className);
+ printRuntimeClass((JVMRuntime)mr, className);
}
count++;
}
}
- private void printRuntimeClass(JavaRuntime jr, String className)
+ private void printRuntimeClass(JVMRuntime jr, String className)
{
- JavaClass jc = Utils.getClassGivenName(className, jr, out);
+ JVMClass jc = Utils.getClassGivenName(className, jr, out);
// if we couldn't find a class of that name, return; the passed in class name could
// still be an array type or it might not exist
@@ -119,7 +119,7 @@
String superClassInfo;
try{
- JavaClass superClass = jc.getSuperclass();
+ JVMClass superClass = jc.getSuperclass();
if (null == superClass) {
superClassInfo = "<no superclass>";
} else {
@@ -139,7 +139,7 @@
String classLoaderInfo;
try{
- JavaClassLoader jClassLoader = jc.getClassLoader();
+ JVMClassLoader jClassLoader = jc.getClassLoader();
classLoaderInfo = "0x" + Long.toHexString(jClassLoader.getObject().getJavaClass().getID().getAddress());
}catch (CorruptDataException cde){
classLoaderInfo = cdeInfo;
@@ -176,7 +176,7 @@
printMethods(jc);
}
- private void printClassHierarchy(JavaClass jClass) {
+ private void printClassHierarchy(JVMClass jClass) {
Stack stack = new Stack();
while (null != jClass){
try{
@@ -200,13 +200,13 @@
}
}
- private void printFields(JavaClass jClass) {
+ private void printFields(JVMClass jClass) {
out.print("Fields......\n\n");
ClassOutput.printStaticFields(jClass, out);
ClassOutput.printNonStaticFields(jClass, out);
}
- private void printMethods(JavaClass jClass){
+ private void printMethods(JVMClass jClass){
out.print("Methods......\n\n");
ClassOutput.printMethods(jClass.getDeclaredMethods().iterator(), out);
out.print("\n");
@@ -223,24 +223,24 @@
out.print("\n");
while (itRuntime.hasNext()) {
mr = (ManagedRuntime)itRuntime.next();
- if (mr instanceof JavaRuntime)
+ if (mr instanceof JVMRuntime)
{
out.print("Runtime #" + count + ": \n\n");
- printRuntimeClasses((JavaRuntime)mr);
+ printRuntimeClasses((JVMRuntime)mr);
out.print("\n\n");
}
count++;
}
}
- private void printRuntimeClasses(JavaRuntime jr) {
+ private void printRuntimeClasses(JVMRuntime jr) {
Map javaClasses = new HashMap();
Iterator itClassLoader = jr.getJavaClassLoaders().iterator();
// create Map of all classes in this JavaRuntime's class loaders
while (itClassLoader.hasNext()) {
- JavaClassLoader jcl = (JavaClassLoader)itClassLoader.next();
+ JVMClassLoader jcl = (JVMClassLoader)itClassLoader.next();
// Check for any corrupt data for this classloader
Iterator itCache = jcl.getCachedClasses().iterator();
@@ -260,7 +260,7 @@
Iterator itClass = jcl.getDefinedClasses().iterator();
while (itClass.hasNext()) {
- javaClasses.put((JavaClass)itClass.next(), new Datum());
+ javaClasses.put((JVMClass)itClass.next(), new Datum());
}
}
@@ -277,7 +277,7 @@
out.print("\n\t No information found for loaded classes\n");
}
while (itClass.hasNext()) {
- JavaClass jc = (JavaClass)itClass.next();
+ JVMClass jc = (JVMClass)itClass.next();
String className;
try {
@@ -298,19 +298,19 @@
}
}
- private void updateInstanceCount(JavaRuntime jr, Map javaClasses) {
+ private void updateInstanceCount(JVMRuntime jr, Map javaClasses) {
Iterator itHeap = jr.getHeaps().iterator();
while (itHeap.hasNext()) {
- JavaHeap jh = (JavaHeap)itHeap.next();
+ JVMHeap jh = (JVMHeap)itHeap.next();
Iterator itObject = jh.getObjects().iterator();
while (itObject.hasNext()) {
Object next = itObject.next();
// Check that this is a JavaObject (there may be CorruptData objects in the
// JavaHeap, we don't attempt to count these as instances of known classes).
- if (next instanceof JavaObject) {
- JavaObject jo = (JavaObject)next;
+ if (next instanceof JVMObject) {
+ JVMObject jo = (JVMObject)next;
Datum d = null;
- JavaClass jc;
+ JVMClass jc;
try {
jc = jo.getJavaClass();
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoHeapCommand.java Wed Oct 21 10:29:55 2009
@@ -22,9 +22,9 @@
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.image.ImageSection;
import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -74,25 +74,25 @@
out.print("\n");
while (itRuntime.hasNext()) {
mr = (ManagedRuntime)itRuntime.next();
- if (mr instanceof JavaRuntime)
+ if (mr instanceof JVMRuntime)
{
out.print("\tRuntime #" + count);
out.print("\n");
if (args.isEmpty()){
- printHeapInfo(null,(JavaRuntime)mr, out);
+ printHeapInfo(null,(JVMRuntime)mr, out);
out.print("\nUse \"info heap *\" or \"info heap <heap_name>\" " +
"for more information.\n");
} else if (param.indexOf("*")>=0){
- printHeapInfo(param,(JavaRuntime)mr, out);
+ printHeapInfo(param,(JVMRuntime)mr, out);
} else {
- boolean foundHeap = searchForHeap(param, (JavaRuntime)mr, out);
+ boolean foundHeap = searchForHeap(param, (JVMRuntime)mr, out);
if (!foundHeap){
out.error("Unable to locate heap: \"" + param +"\".");
out.print("\tAvailable heaps: \n");
- printHeapInfo(null,(JavaRuntime)mr, out);
+ printHeapInfo(null,(JVMRuntime)mr, out);
}
}
@@ -100,14 +100,14 @@
count++;
}
}
- private void printHeapInfo(String param, JavaRuntime runtime, Output out){
+ private void printHeapInfo(String param, JVMRuntime runtime, Output out){
Iterator itHeaps = runtime.getHeaps().iterator();
int countheaps = 1;
while (itHeaps.hasNext())
{
- JavaHeap theHeap = (JavaHeap)itHeaps.next();
+ JVMHeap theHeap = (JVMHeap)itHeaps.next();
out.print("\t Heap #" + countheaps + ": " + theHeap.getName()+ "\n");
if (param != null){
printSectionInfo(theHeap, out);
@@ -115,7 +115,7 @@
countheaps++;
}
}
- private void printSectionInfo(JavaHeap theHeap, Output out){
+ private void printSectionInfo(JVMHeap theHeap, Output out){
Iterator itSections = theHeap.getSections().iterator();
int countSections = 1;
@@ -139,7 +139,7 @@
countSections++;
}
}
- private boolean searchForHeap(String param, JavaRuntime jr, Output out){
+ private boolean searchForHeap(String param, JVMRuntime jr, Output out){
boolean foundHeap = false;
@@ -148,7 +148,7 @@
while (itHeaps.hasNext())
{
- JavaHeap theHeap = (JavaHeap)itHeaps.next();
+ JVMHeap theHeap = (JVMHeap)itHeaps.next();
if (theHeap.getName().indexOf(param)==0){
out.print("\t Heap #" + countheaps + ": " + theHeap.getName()+"\n");
printOccupancyInfo(theHeap, out);
@@ -161,7 +161,7 @@
return foundHeap;
}
- private void printOccupancyInfo(JavaHeap theHeap, Output out){
+ private void printOccupancyInfo(JVMHeap theHeap, Output out){
/*
* This method takes a lot of time and hence this information is only included
* when using "info heap <heapname>". If this method was run for every heap
@@ -180,7 +180,7 @@
Iterator itObjects = theHeap.getObjects().iterator();
try{
while (itObjects.hasNext()){
- JavaObject theObject = (JavaObject)itObjects.next();
+ JVMObject theObject = (JVMObject)itObjects.next();
totalObjectSize = totalObjectSize + theObject.getSize();
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoJitmCommand.java Wed Oct 21 10:29:55 2009
@@ -20,10 +20,10 @@
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.image.ImageSection;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -54,16 +54,16 @@
Iterator itJavaRuntime = Utils.getRuntimes(loadedImage);
while (itJavaRuntime.hasNext())
{
- JavaRuntime jr = (JavaRuntime)itJavaRuntime.next();
+ JVMRuntime jr = (JVMRuntime)itJavaRuntime.next();
Iterator itJavaClassLoader = jr.getJavaClassLoaders().iterator();
while (itJavaClassLoader.hasNext())
{
- JavaClassLoader jcl = (JavaClassLoader)itJavaClassLoader.next();
+ JVMClassLoader jcl = (JVMClassLoader)itJavaClassLoader.next();
Iterator itJavaClass = jcl.getDefinedClasses().iterator();
while (itJavaClass.hasNext())
{
- JavaClass jc = (JavaClass)itJavaClass.next();
+ JVMClass jc = (JVMClass)itJavaClass.next();
Iterator itJavaMethod = jc.getDeclaredMethods().iterator();
String jcName;
@@ -75,7 +75,7 @@
while (itJavaMethod.hasNext())
{
- JavaMethod jm = (JavaMethod)itJavaMethod.next();
+ JVMMethod jm = (JVMMethod)itJavaMethod.next();
String name;
String sig;
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoLockCommand.java Wed Oct 21 10:29:55 2009
@@ -21,11 +21,11 @@
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.DataUnavailable;
import javax.tools.diagnostics.image.Image;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMThread;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -47,13 +47,13 @@
Iterator runtimes = Utils.getRuntimes(loadedImage);
while(runtimes.hasNext()){
- JavaRuntime jRuntime = (JavaRuntime)runtimes.next();
+ JVMRuntime jRuntime = (JVMRuntime)runtimes.next();
Iterator monitors = jRuntime.getMonitors().iterator();
out.println("\nSystem locks...");
while (monitors.hasNext()){
- JavaMonitor jMonitor = (JavaMonitor)monitors.next();
- JavaObject jObject = jMonitor.getObject();
+ JVMMonitor jMonitor = (JVMMonitor)monitors.next();
+ JVMObject jObject = jMonitor.getObject();
try {
String monitorName = jMonitor.getName().trim();
if (monitorName.equalsIgnoreCase("")) {
@@ -61,7 +61,7 @@
}
out.println("id: 0x" + jMonitor.getID() + " name: " + jMonitor.getName());
- JavaThread owner = jMonitor.getOwner();
+ JVMThread owner = jMonitor.getOwner();
if (null != owner) {
try {
out.println("\towner thread id: " + owner.getImageThread().getID()
@@ -74,7 +74,7 @@
// List any threads waiting on enter or notify for this monitor
Iterator itEnterWaiter = jMonitor.getEnterWaiters().iterator();
while (itEnterWaiter.hasNext()) {
- JavaThread jThread = (JavaThread)itEnterWaiter.next();
+ JVMThread jThread = (JVMThread)itEnterWaiter.next();
try {
out.println("\twaiting thread id: " + jThread.getImageThread().getID()
+ " name: " + jThread.getName());
@@ -84,7 +84,7 @@
}
Iterator itNotifyWaiter = jMonitor.getNotifyWaiters().iterator();
while (itNotifyWaiter.hasNext()) {
- JavaThread jThread = (JavaThread)itNotifyWaiter.next();
+ JVMThread jThread = (JVMThread)itNotifyWaiter.next();
try {
out.println("\twaiting thread id: " + jThread.getImageThread().getID()
+ " name: " + jThread.getName());
@@ -110,12 +110,12 @@
}
Iterator lockedObjects = vMonitorsWithLockedObjects.iterator();
while(lockedObjects.hasNext()){
- JavaMonitor jMonitor = (JavaMonitor)lockedObjects.next();
- JavaObject jObject = jMonitor.getObject();
+ JVMMonitor jMonitor = (JVMMonitor)lockedObjects.next();
+ JVMObject jObject = jMonitor.getObject();
try{
- JavaThread owner = jMonitor.getOwner();
+ JVMThread owner = jMonitor.getOwner();
String className = "<unknown class>";
- JavaClass jClass = jObject.getJavaClass();
+ JVMClass jClass = jObject.getJavaClass();
if (null != jClass) {
className = jClass.getName();
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoPropertyCommand.java Wed Oct 21 10:29:55 2009
@@ -23,10 +23,10 @@
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.image.DiagnosticException;
import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -60,57 +60,57 @@
this.args = args;
}
- public void visit(JavaRuntime runtime) throws DiagnosticException {
+ public void visit(JVMRuntime runtime) throws DiagnosticException {
int thisRuntime = runtimeNum++;
- JavaClass systemClass = KatoSearch.findClass(runtime, "java/lang/System");
+ JVMClass systemClass = KatoSearch.findClass(runtime, "java/lang/System");
Properties properties = new Properties();
if (systemClass != null) {
try{
- JavaField props = KatoSearch.getField(systemClass, "props");
+ JVMField props = KatoSearch.getField(systemClass, "props");
if (props == null) {
return;
}
- JavaObject systemProperties = (JavaObject) props.get(null);
+ JVMObject systemProperties = (JVMObject) props.get(null);
if (systemProperties == null) {
return;
}
- JavaClass propertyClass = systemProperties.getJavaClass();
- JavaField tableField = KatoSearch.getField(propertyClass,"table");
- JavaObject table = (JavaObject) tableField.get(systemProperties);
+ JVMClass propertyClass = systemProperties.getJavaClass();
+ JVMField tableField = KatoSearch.getField(propertyClass,"table");
+ JVMObject table = (JVMObject) tableField.get(systemProperties);
- JavaClass entryClass = KatoSearch.findClass(runtime, "java/util/Hashtable$Entry");
+ JVMClass entryClass = KatoSearch.findClass(runtime, "java/util/Hashtable$Entry");
if (entryClass == null) {
System.err.println("Couldn't find Entry class");
return;
}
- JavaField keyField = KatoSearch.getField(entryClass, "key");
+ JVMField keyField = KatoSearch.getField(entryClass, "key");
if (keyField == null) {
System.err.println("Couldn't find key field");
return;
}
- JavaField valueField = KatoSearch.getField(entryClass, "value");
+ JVMField valueField = KatoSearch.getField(entryClass, "value");
if (valueField == null) {
System.err.println("Couldn't find value field");
return;
}
- JavaField nextField = KatoSearch.getField(entryClass, "next");
+ JVMField nextField = KatoSearch.getField(entryClass, "next");
if (nextField == null) {
System.err.println("Couldn't find next field");
return;
}
int tableSize = table.getArraySize();
- JavaObject[] entries = new JavaObject[tableSize];
+ JVMObject[] entries = new JVMObject[tableSize];
table.arraycopy(0, entries, 0, tableSize);
for (int n=0; n < tableSize; n++) {
- JavaObject entry = entries[n];
+ JVMObject entry = entries[n];
while (entry != null) {
@@ -118,7 +118,7 @@
String value = valueField.getString(entry);
properties.setProperty(key, value);
- entry = (JavaObject) nextField.get(entry);
+ entry = (JVMObject) nextField.get(entry);
}
}
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/infocommands/InfoThreadCommand.java Wed Oct 21 10:29:55 2009
@@ -33,12 +33,12 @@
import javax.tools.diagnostics.image.ImageThread;
import javax.tools.diagnostics.image.DiagnosticException;
import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -346,13 +346,13 @@
while (itRuntime.hasNext()) {
mr = (ManagedRuntime)itRuntime.next();
- if (mr instanceof JavaRuntime)
+ if (mr instanceof JVMRuntime)
{
- JavaRuntime jr = (JavaRuntime)mr;
+ JVMRuntime jr = (JVMRuntime)mr;
Iterator itThread = jr.getThreads().iterator();
while (itThread.hasNext()) {
- JavaThread jt = (JavaThread)itThread.next();
+ JVMThread jt = (JVMThread)itThread.next();
String currID;
try {
@@ -388,21 +388,21 @@
return threads;
}
- private Map getMonitors(JavaRuntime jr)
+ private Map getMonitors(JVMRuntime jr)
{
Map monitors = new HashMap();
Iterator itMonitor = jr.getMonitors().iterator();
while (itMonitor.hasNext()) {
- JavaMonitor jm = (JavaMonitor)itMonitor.next();
+ JVMMonitor jm = (JVMMonitor)itMonitor.next();
Iterator itEnterWaiter = jm.getEnterWaiters().iterator();
while (itEnterWaiter.hasNext()) {
- JavaThread jt = (JavaThread)itEnterWaiter.next();
+ JVMThread jt = (JVMThread)itEnterWaiter.next();
monitors.put(jt, new MonitorState(jm, MonitorState.WAITING_TO_ENTER));
}
Iterator itNotifyWaiter = jm.getNotifyWaiters().iterator();
while (itNotifyWaiter.hasNext()) {
- JavaThread jt = (JavaThread)itNotifyWaiter.next();
+ JVMThread jt = (JVMThread)itNotifyWaiter.next();
monitors.put(jt, new MonitorState(jm, MonitorState.WAITING_TO_BE_NOTIFIED_ON));
}
}
@@ -410,7 +410,7 @@
return monitors;
}
- private void printJavaThreadInfo(Output out, JavaThread jt, Map monitors)
+ private void printJavaThreadInfo(Output out, JVMThread jt, Map monitors)
{
out.print("\t name: ");
try {
@@ -422,7 +422,7 @@
out.print("\t Thread object: ");
try {
- JavaObject threadObj = jt.getObject();
+ JVMObject threadObj = jt.getObject();
if (null == threadObj) {
out.print("<no associated Thread object>");
} else {
@@ -472,7 +472,7 @@
} catch (CorruptDataException cde) {
out.print(Exceptions.getCorruptDataExceptionString());
}
- JavaObject jo = ms.getMonitor().getObject();
+ JVMObject jo = ms.getMonitor().getObject();
if (null == jo) {
// working with a raw monitor
out.print(" with ID ");
@@ -491,11 +491,11 @@
out.print("\n");
}
- private void printJavaStackFrameInfo(JavaThread jt, Output out)
+ private void printJavaStackFrameInfo(JVMThread jt, Output out)
{
Iterator itStackFrame;
- JavaStackFrame jsf;
- JavaLocation jl;
+ JVMStackFrame jsf;
+ JVMLocation jl;
itStackFrame = jt.getStackFrames().iterator();
if (!itStackFrame.hasNext()) {
@@ -511,7 +511,7 @@
out.print("\t " + Exceptions.getCorruptDataExceptionString() + "\n");
return;
} else {
- jsf = (JavaStackFrame)next;
+ jsf = (JVMStackFrame)next;
}
try {
jl = jsf.getLocation();
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatJSPCommand.java Wed Oct 21 10:29:55 2009
@@ -20,12 +20,12 @@
import javax.tools.diagnostics.image.CorruptData;
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.image.DiagnosticException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -65,14 +65,14 @@
*/
private class PrintJSP implements JavaRuntimeVisitor {
boolean found = false;
- JavaRuntime runtime;
+ JVMRuntime runtime;
- public void visit(JavaRuntime runtime) throws DiagnosticException {
+ public void visit(JVMRuntime runtime) throws DiagnosticException {
found = false;
this.runtime = runtime;
- List<JavaClass> jsps = KatoSearch.findClasses(runtime, JSP_CLASS);
+ List<JVMClass> jsps = KatoSearch.findClasses(runtime, JSP_CLASS);
- for (JavaClass jsp : jsps) {
+ for (JVMClass jsp : jsps) {
// Avoid the JSP superclass itself.
if (JSP_CLASS.equals(jsp.getName())) {
continue;
@@ -81,16 +81,16 @@
found = true;
out.println("Found JSP: "+ jsp.getName() + ", instances: ");
- List<JavaObject> instances = KatoSearch.findInstances(runtime, jsp);
+ List<JVMObject> instances = KatoSearch.findInstances(runtime, jsp);
- for (JavaObject instance : instances) {
+ for (JVMObject instance : instances) {
out.println("\t0x"+Long.toHexString(instance.getID().getAddress()));
}
out.println("\nJavaThread: ");
- List<JavaThread> threads = KatoSearch.findClassInThreads(runtime, jsp);
+ List<JVMThread> threads = KatoSearch.findClassInThreads(runtime, jsp);
- for (JavaThread thread : threads) {
+ for (JVMThread thread : threads) {
out.println("\tJava stack trace for thread `" + thread.getName() + "'");
out.println("\t=========================================================\n");
@@ -99,7 +99,7 @@
continue;
}
- JavaLocation location = ((JavaStackFrame) nextFrame).getLocation();
+ JVMLocation location = ((JVMStackFrame) nextFrame).getLocation();
if (location != null) {
out.println("\t"+location);
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatThreadPoolsCommand.java Wed Oct 21 10:29:55 2009
@@ -19,10 +19,10 @@
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.image.DiagnosticException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -65,9 +65,9 @@
*/
private class PrintVersion implements JavaRuntimeVisitor, JavaClassVisitor {
boolean found = false;
- JavaRuntime runtime;
+ JVMRuntime runtime;
- public void visit(JavaRuntime runtime) throws DiagnosticException {
+ public void visit(JVMRuntime runtime) throws DiagnosticException {
found = false;
this.runtime = runtime;
KatoSearch.visitClasses(runtime, this);
@@ -77,18 +77,18 @@
}
}
- public boolean visit(JavaClass clazz) throws DiagnosticException {
+ public boolean visit(JVMClass clazz) throws DiagnosticException {
if (clazz.getName().equals(THREAD_POOL_CLASS)) {
found = true;
- JavaField nameField = KatoSearch.getField(clazz, POOL_NAME);
- JavaField busyField = KatoSearch.getField(clazz, CURRENT_BUSY);
- JavaField countField = KatoSearch.getField(clazz, CURRENT_COUNT);
+ JVMField nameField = KatoSearch.getField(clazz, POOL_NAME);
+ JVMField busyField = KatoSearch.getField(clazz, CURRENT_BUSY);
+ JVMField countField = KatoSearch.getField(clazz, CURRENT_COUNT);
- List<JavaObject> instances = KatoSearch.findInstances(runtime, clazz);
+ List<JVMObject> instances = KatoSearch.findInstances(runtime, clazz);
if (instances.size() >0) {
out.println("Found thread pools");
- for (JavaObject obj : instances) {
+ for (JVMObject obj : instances) {
try {
out.println("Pool name:" + nameField.getString(obj)+", threads: "
+ countField.getInt(obj) +
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/tomcat/TomcatVersionCommand.java Wed Oct 21 10:29:55 2009
@@ -18,9 +18,9 @@
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.image.DiagnosticException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -64,7 +64,7 @@
private class PrintVersion implements JavaRuntimeVisitor, JavaClassVisitor {
boolean found = false;
- public void visit(JavaRuntime runtime) throws DiagnosticException {
+ public void visit(JVMRuntime runtime) throws DiagnosticException {
found = false;
KatoSearch.visitClasses(runtime, this);
@@ -73,11 +73,11 @@
}
}
- public boolean visit(JavaClass clazz) throws DiagnosticException {
+ public boolean visit(JVMClass clazz) throws DiagnosticException {
if (clazz.getName().equals(SERVER_INFO_CLASS)) {
- JavaField serverNumberField = KatoSearch.getField(clazz, SERVER_NUMBER);
- JavaField serverBuiltField = KatoSearch.getField(clazz, SERVER_BUILT);
- JavaField serverInfoField = KatoSearch.getField(clazz, SERVER_INFO);
+ JVMField serverNumberField = KatoSearch.getField(clazz, SERVER_NUMBER);
+ JVMField serverBuiltField = KatoSearch.getField(clazz, SERVER_BUILT);
+ JVMField serverInfoField = KatoSearch.getField(clazz, SERVER_INFO);
out.println("Found Tomcat server: ");
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tools.katoview/src/main/java/org/apache/kato/katoview/commands/xcommands/XJCommand.java Wed Oct 21 10:29:55 2009
@@ -20,10 +20,10 @@
import javax.tools.diagnostics.image.CorruptDataException;
import javax.tools.diagnostics.image.Image;
import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
import org.apache.kato.katoview.Output;
import org.apache.kato.katoview.commands.Command;
@@ -119,7 +119,7 @@
out.print("\n");
while (itRuntime.hasNext()) {
mr = (ManagedRuntime)itRuntime.next();
- if (mr instanceof JavaRuntime)
+ if (mr instanceof JVMRuntime)
{
out.print("\truntime #" + count + " - version: ");
try {
@@ -129,21 +129,21 @@
}
out.print("\n");
- printHeapObjects((JavaRuntime)mr, objAddress, objName, out, supers);
+ printHeapObjects((JVMRuntime)mr, objAddress, objName, out, supers);
}
count++;
}
}
- private void printHeapObjects(JavaRuntime jr, Long objAddress, String objName,
+ private void printHeapObjects(JVMRuntime jr, Long objAddress, String objName,
Output out, boolean supers)
{
- JavaHeap jh;
+ JVMHeap jh;
Iterator itHeap = jr.getHeaps().iterator();
int count = 1;
while (itHeap.hasNext()) {
- jh = (JavaHeap)itHeap.next();
+ jh = (JVMHeap)itHeap.next();
out.print("\t heap #" + count + " - name: ");
out.print(jh.getName());
@@ -154,16 +154,16 @@
}
}
- private void printObjects(JavaHeap jh, Long objAddress, String objName, Output out,
- boolean supers, JavaRuntime jr)
+ private void printObjects(JVMHeap jh, Long objAddress, String objName, Output out,
+ boolean supers, JVMRuntime jr)
{
- JavaObject jo;
+ JVMObject jo;
Iterator itObject = jh.getObjects().iterator();
boolean found = false;
if (objName != null)
{
- JavaClass objClass = Utils.getClassGivenName(objName, jr, out);
+ JVMClass objClass = Utils.getClassGivenName(objName, jr, out);
// if we couldn't find a class of that name, return; the passed in class name could
// still be an array type or it might not exist
@@ -177,12 +177,12 @@
while (itObject.hasNext())
{
- jo = (JavaObject)itObject.next();
+ jo = (JVMObject)itObject.next();
String className;
String hierarchy = "";
- JavaClass jc;
+ JVMClass jc;
try {
jc = jo.getJavaClass();
@@ -249,12 +249,12 @@
boolean done = false;
while (itObject.hasNext() && !done)
{
- jo = (JavaObject)itObject.next();
+ jo = (JVMObject)itObject.next();
if (jo.getID().getAddress() == objAddress.longValue())
{
- JavaClass jc;
+ JVMClass jc;
found = true;
out.print("\t ");