|
From: Pavel V. <va...@us...> - 2002-09-07 19:38:26
|
Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv1709
Modified Files:
TestSnap2.java TestSnap.java DebugOutput.java
Log Message:
problems in compilation fixed
Index: TestSnap2.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/TestSnap2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TestSnap2.java 11 Jul 2002 18:42:56 -0000 1.1
--- TestSnap2.java 7 Sep 2002 19:38:23 -0000 1.2
***************
*** 85,89 ****
public void runTest() {
! Bootstrap.virtualMachineManager().defaultConnector();
try {
--- 85,89 ----
public void runTest() {
! Bootstrap.connectorManager().defaultConnector();
try {
***************
*** 112,114 ****
};
! //GetCurtime
\ No newline at end of file
--- 112,114 ----
};
! //GetCurtime
Index: TestSnap.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/TestSnap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** TestSnap.java 20 Apr 2002 22:40:50 -0000 1.7
--- TestSnap.java 7 Sep 2002 19:38:23 -0000 1.8
***************
*** 131,133 ****
};
! //GetCurtime
\ No newline at end of file
--- 131,133 ----
};
! //GetCurtime
Index: DebugOutput.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/DebugOutput.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DebugOutput.java 16 Feb 2002 16:22:18 -0000 1.4
--- DebugOutput.java 7 Sep 2002 19:38:23 -0000 1.5
***************
*** 32,36 ****
public static void print (SnapshotImpl sn) {
// classes list, ClassData object type
! Iterator it = sn.classes().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
--- 32,36 ----
public static void print (SnapshotImpl sn) {
// classes list, ClassData object type
! Iterator it = sn.getClasses().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
***************
*** 46,52 ****
}
System.out.println("INSTANCE FIELDS:");
! Iterator itI = c.getInstanceFields().iterator();
while (itI.hasNext()) {
! ClassFieldData f = (ClassFieldData) itI.next();
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
--- 46,54 ----
}
System.out.println("INSTANCE FIELDS:");
! Iterator itI = c.getFields().iterator();
while (itI.hasNext()) {
! FieldData f = (FieldData) itI.next();
! if ( f.isStatic() )
! continue;
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
***************
*** 54,60 ****
}
System.out.println("STATIC FIELDS:");
! Iterator itS = c.getStaticFields().iterator();
while (itS.hasNext()) {
! ClassFieldData f = (ClassFieldData) itS.next();
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
--- 56,64 ----
}
System.out.println("STATIC FIELDS:");
! Iterator itS = c.getFields().iterator();
while (itS.hasNext()) {
! FieldData f = (FieldData) itS.next();
! if ( !f.isStatic() )
! continue;
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
***************
*** 64,68 ****
// groupThreads list, ThreadGroupData object type
! it = sn.groupOfThreads().iterator();
while (it.hasNext()) {
ThreadGroupData g = (ThreadGroupData) it.next();
--- 68,72 ----
// groupThreads list, ThreadGroupData object type
! it = sn.getThreadGroups().iterator();
while (it.hasNext()) {
ThreadGroupData g = (ThreadGroupData) it.next();
***************
*** 76,88 ****
// objectTypes list, AllocClassData object type
! it = sn.allocTypes().iterator();
while (it.hasNext()) {
! AllocTypeData o = (AllocTypeData) it.next();
System.out.println("OBJECT TYPE:");
! ClassData c = o.getClazz();
if (c != null) System.out.println("CLASS = " + c.getName());
System.out.print("IS_ARRAY = ");
String s;
! switch (o.getArrayType()) {
case IProf.JVMPI_NORMAL_OBJECT:
s = "JVMPI_NORMAL_OBJECT";
--- 80,93 ----
// objectTypes list, AllocClassData object type
! it = sn.getTypes().iterator();
while (it.hasNext()) {
! TypeData o = (TypeData) it.next();
System.out.println("OBJECT TYPE:");
! ClassData c = (ClassData) o.getComponentClass();
if (c != null) System.out.println("CLASS = " + c.getName());
System.out.print("IS_ARRAY = ");
String s;
! //FIXME
! /*switch (o.getArrayType()) {
case IProf.JVMPI_NORMAL_OBJECT:
s = "JVMPI_NORMAL_OBJECT";
***************
*** 119,123 ****
break;
}
! System.out.println(s);
System.out.println();
}
--- 124,128 ----
break;
}
! System.out.println(s); */
System.out.println();
}
***************
*** 125,129 ****
// arenas list, AllocArenaData object type
// FIX arenas()
! it = sn.arenas().iterator();
while (it.hasNext()) {
AllocArenaData a = (AllocArenaData) it.next();
--- 130,134 ----
// arenas list, AllocArenaData object type
// FIX arenas()
! it = sn.getArenas().iterator();
while (it.hasNext()) {
AllocArenaData a = (AllocArenaData) it.next();
***************
*** 137,143 ****
// gcs list, GCData object type
// FIX gcs()
! it = sn.gcs().iterator();
while (it.hasNext()) {
! GCData g = (GCData) it.next();
System.out.println("GC:");
System.out.println("start: " + g.getStartTime());
--- 142,148 ----
// gcs list, GCData object type
// FIX gcs()
! it = sn.getGCRuns().iterator();
while (it.hasNext()) {
! GCRunData g = (GCRunData) it.next();
System.out.println("GC:");
System.out.println("start: " + g.getStartTime());
***************
*** 170,174 ****
int totalMonThreadMethods = 0;
int totalMonThreadTraces = 0;
! it = sn.classes().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
--- 175,179 ----
int totalMonThreadMethods = 0;
int totalMonThreadTraces = 0;
! it = sn.getClasses().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
***************
*** 176,190 ****
while (itM.hasNext()) {
MethodData m = (MethodData) itM.next();
! Iterator itT = m.getAllocTraces().values().iterator();
while (itT.hasNext()) {
AllocTraceData t = (AllocTraceData) itT.next();
totalAllocTraces ++;
}
! itT = m.getCPUTraces().values().iterator();
while (itT.hasNext()) {
CPUTraceData t = (CPUTraceData) itT.next();
totalCpuTraces ++;
}
! itT = m.getMonTraces().values().iterator();
while (itT.hasNext()) {
MonTraceData t = (MonTraceData) itT.next();
--- 181,195 ----
while (itM.hasNext()) {
MethodData m = (MethodData) itM.next();
! Iterator itT = m.getAllocTraces().iterator();
while (itT.hasNext()) {
AllocTraceData t = (AllocTraceData) itT.next();
totalAllocTraces ++;
}
! itT = m.getCPUTraces().iterator();
while (itT.hasNext()) {
CPUTraceData t = (CPUTraceData) itT.next();
totalCpuTraces ++;
}
! itT = m.getMonTraces().iterator();
while (itT.hasNext()) {
MonTraceData t = (MonTraceData) itT.next();
***************
*** 195,205 ****
totalClasses ++;
}
! it = sn.allocTypes().iterator();
while (it.hasNext()) {
! AllocTypeData a = (AllocTypeData) it.next();
! Iterator itM = a.getMethods().values().iterator();
while (itM.hasNext()) {
AllocTypeMethodData m = (AllocTypeMethodData) itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
AllocTypeTraceData t = (AllocTypeTraceData) itT.next();
--- 200,210 ----
totalClasses ++;
}
! it = sn.getTypes().iterator();
while (it.hasNext()) {
! TypeData a = (TypeData) it.next();
! Iterator itM = a.getAllocTypeMethods().iterator();
while (itM.hasNext()) {
AllocTypeMethodData m = (AllocTypeMethodData) itM.next();
! Iterator itT = m.getAllocTypeTraces().iterator();
while (itT.hasNext()) {
AllocTypeTraceData t = (AllocTypeTraceData) itT.next();
***************
*** 210,227 ****
totalAllocObjects ++;
}
! it = sn.threads().iterator();
while (it.hasNext()) {
ThreadData th = (ThreadData) it.next();
! Iterator itA = th.getTypes().values().iterator();
while (itA.hasNext()) {
! AllocThreadTypeData a = (AllocThreadTypeData) itA.next();
! Iterator itM = a.getMethods().values().iterator();
while (itM.hasNext()) {
! AllocThreadTypeMethodData m = (AllocThreadTypeMethodData)
itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
! AllocThreadTypeTraceData t =
! (AllocThreadTypeTraceData) itT.next();
totalAllocThreadObjectTraces ++;
}
--- 215,232 ----
totalAllocObjects ++;
}
! it = sn.getThreads().iterator();
while (it.hasNext()) {
ThreadData th = (ThreadData) it.next();
! Iterator itA = th.getAllocTypeThreads().iterator();
while (itA.hasNext()) {
! AllocTypeThreadData a = (AllocTypeThreadData) itA.next();
! Iterator itM = a.getAllocTypeThreadMethods().iterator();
while (itM.hasNext()) {
! AllocTypeThreadMethodData m = (AllocTypeThreadMethodData)
itM.next();
! Iterator itT = m.getAllocTypeThreadTraces().iterator();
while (itT.hasNext()) {
! AllocTypeThreadTraceData t =
! (AllocTypeThreadTraceData) itT.next();
totalAllocThreadObjectTraces ++;
}
***************
*** 230,237 ****
totalAllocThreadObjects ++;
}
! Iterator itM = th.getAllocMethods().values().iterator();
while (itM.hasNext()) {
AllocThreadMethodData m = (AllocThreadMethodData) itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
AllocThreadTraceData t = (AllocThreadTraceData) itT.next();
--- 235,242 ----
totalAllocThreadObjects ++;
}
! Iterator itM = th.getAllocThreadMethods().iterator();
while (itM.hasNext()) {
AllocThreadMethodData m = (AllocThreadMethodData) itM.next();
! Iterator itT = m.getAllocThreadTraces().iterator();
while (itT.hasNext()) {
AllocThreadTraceData t = (AllocThreadTraceData) itT.next();
***************
*** 240,247 ****
totalAllocThreadMethods ++;
}
! itM = th.getCPUMethods().values().iterator();
while (itM.hasNext()) {
CPUThreadMethodData m = (CPUThreadMethodData) itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
CPUThreadTraceData t = (CPUThreadTraceData) itT.next();
--- 245,252 ----
totalAllocThreadMethods ++;
}
! itM = th.getCPUThreadMethods().iterator();
while (itM.hasNext()) {
CPUThreadMethodData m = (CPUThreadMethodData) itM.next();
! Iterator itT = m.getCPUThreadTraces().iterator();
while (itT.hasNext()) {
CPUThreadTraceData t = (CPUThreadTraceData) itT.next();
***************
*** 250,257 ****
totalCpuThreadMethods ++;
}
! itM = th.getMonMethods().values().iterator();
while (itM.hasNext()) {
MonThreadMethodData m = (MonThreadMethodData) itM.next();
! Iterator itT = m. getTraces().values().iterator();
while (itT.hasNext()) {
MonThreadTraceData t = (MonThreadTraceData) itT.next();
--- 255,262 ----
totalCpuThreadMethods ++;
}
! itM = th.getMonThreadMethods().iterator();
while (itM.hasNext()) {
MonThreadMethodData m = (MonThreadMethodData) itM.next();
! Iterator itT = m.getMonThreadTraces().iterator();
while (itT.hasNext()) {
MonThreadTraceData t = (MonThreadTraceData) itT.next();
***************
*** 296,299 ****
--- 301,307 ----
/*
* $Log$
+ * Revision 1.5 2002/09/07 19:38:23 vachis
+ * problems in compilation fixed
+ *
* Revision 1.4 2002/02/16 16:22:18 vachis
* code refacorization Class.. to Type... (forgotten methods)
|