Menu
▾
▴
[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data CPUThreadMethodData.java,1.10,1.11 CPUTraceData.java,1.13,1.14 MethodData.java,1.16,1.17 MonThreadMethodData.java,1.7,1.8 MonTraceData.java,1.10,1.11 ThreadData.java,1.20,1.21 TypeData.java,1.1,1.2
|
From: Pavel V. <va...@us...> - 2002-05-14 14:08:06
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv20543
Modified Files:
CPUThreadMethodData.java CPUTraceData.java MethodData.java
MonThreadMethodData.java MonTraceData.java ThreadData.java
TypeData.java
Log Message:
"cross" methods
Index: CPUThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUThreadMethodData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** CPUThreadMethodData.java 8 May 2002 08:08:57 -0000 1.10
--- CPUThreadMethodData.java 14 May 2002 14:05:36 -0000 1.11
***************
*** 79,84 ****
void addTrace(CPUThreadTraceData trace) {
cpuThreadTraces.add(trace);
! //pending MAP
! }
// ---------- return parents
--- 79,83 ----
void addTrace(CPUThreadTraceData trace) {
cpuThreadTraces.add(trace);
! }
// ---------- return parents
***************
*** 121,126 ****
*/
public CPUThreadTraceRef getCPUThreadTrace(CPUTraceRef peer) {
return null;
- //PENDING
}
--- 120,132 ----
*/
public CPUThreadTraceRef getCPUThreadTrace(CPUTraceRef peer) {
+ ListIterator itr = getCPUThreadTraces().listIterator();
+ CPUThreadTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (CPUThreadTraceRef) itr.next();
+ if ( obj.getCPUTrace().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 154,157 ****
--- 160,166 ----
/*
* $Log$
+ * Revision 1.11 2002/05/14 14:05:36 vachis
+ * "cross" methods
+ *
* Revision 1.10 2002/05/08 08:08:57 vachis
* siblings
Index: CPUTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUTraceData.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** CPUTraceData.java 13 May 2002 21:25:56 -0000 1.13
--- CPUTraceData.java 14 May 2002 14:05:36 -0000 1.14
***************
*** 84,88 ****
void addThread(CPUThreadTraceData thread) {
cpuThreadTraces.add(thread);
- //pending MAP
}
--- 84,87 ----
***************
*** 135,140 ****
*/
public CPUThreadTraceRef getCPUThreadTrace(ThreadRef peer) {
return null;
- //PENDING
}
--- 134,146 ----
*/
public CPUThreadTraceRef getCPUThreadTrace(ThreadRef peer) {
+ ListIterator itr = getCPUThreadTraces().listIterator();
+ CPUThreadTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (CPUThreadTraceRef) itr.next();
+ if ( obj.getThread().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 149,156 ****
public AllocTraceRef getSiblingAlloc() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! AllocTraceData trace;
while ( itr.hasNext() ) {
! trace = (AllocTraceData) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
--- 155,162 ----
public AllocTraceRef getSiblingAlloc() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! AllocTraceRef trace;
while ( itr.hasNext() ) {
! trace = (AllocTraceRef) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
***************
*** 167,174 ****
public MonTraceRef getSiblingMon() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! MonTraceData trace;
while ( itr.hasNext() ) {
! trace = (MonTraceData) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
--- 173,180 ----
public MonTraceRef getSiblingMon() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! MonTraceRef trace;
while ( itr.hasNext() ) {
! trace = (MonTraceRef) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
***************
*** 185,188 ****
--- 191,197 ----
/*
* $Log$
+ * Revision 1.14 2002/05/14 14:05:36 vachis
+ * "cross" methods
+ *
* Revision 1.13 2002/05/13 21:25:56 vachis
* use virtual methods in getting of siblings
Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** MethodData.java 6 May 2002 17:32:13 -0000 1.16
--- MethodData.java 14 May 2002 14:05:36 -0000 1.17
***************
*** 125,129 ****
void addAllocTrace(AllocTraceData trace) {
allocTraces.add(trace);
- //pending MAP
}
--- 125,128 ----
***************
*** 135,139 ****
void addCPUTrace(CPUTraceData trace) {
cpuTraces.add(trace);
- //pending MAP
}
--- 134,137 ----
***************
*** 145,149 ****
void addMonTrace(MonTraceData trace) {
monTraces.add(trace);
- //pending MAP
}
--- 143,146 ----
***************
*** 156,160 ****
void addType(AllocTypeMethodData allocType) {
allocTypeMethods.add(allocType);
- //pending MAP
}
--- 153,156 ----
***************
*** 167,171 ****
void addAllocThread(AllocThreadMethodData thread) {
allocThreadMethods.add(thread);
- //pending MAP
}
--- 163,166 ----
***************
*** 177,181 ****
void addCPUThread(CPUThreadMethodData thread) {
cpuThreadMethods.add(thread);
- //pending MAP
}
--- 172,175 ----
***************
*** 187,191 ****
void addMonThread(MonThreadMethodData thread) {
monThreadMethods.add(thread);
- //pending MAP
}
--- 181,184 ----
***************
*** 295,300 ****
*/
public AllocThreadMethodRef getAllocThreadMethod(ThreadRef peer) {
return null;
- //PENDING
}
--- 288,300 ----
*/
public AllocThreadMethodRef getAllocThreadMethod(ThreadRef peer) {
+ ListIterator itr = getAllocThreadMethods().listIterator();
+ AllocThreadMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocThreadMethodRef) itr.next();
+ if ( obj.getThread().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 317,322 ****
*/
public CPUThreadMethodRef getCPUThreadMethod(ThreadRef peer) {
return null;
- //PENDING
}
--- 317,329 ----
*/
public CPUThreadMethodRef getCPUThreadMethod(ThreadRef peer) {
+ ListIterator itr = getCPUThreadMethods().listIterator();
+ CPUThreadMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (CPUThreadMethodRef) itr.next();
+ if ( obj.getThread().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 339,344 ****
*/
public MonThreadMethodRef getMonThreadMethod(ThreadRef peer) {
return null;
- //PENDING
}
--- 346,358 ----
*/
public MonThreadMethodRef getMonThreadMethod(ThreadRef peer) {
+ ListIterator itr = getMonThreadMethods().listIterator();
+ MonThreadMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (MonThreadMethodRef) itr.next();
+ if ( obj.getThread().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 361,366 ****
*/
public AllocTypeMethodRef getAllocTypeMethod(TypeRef peer) {
return null;
- //PENDING
}
--- 375,387 ----
*/
public AllocTypeMethodRef getAllocTypeMethod(TypeRef peer) {
+ ListIterator itr = getAllocTypeMethods().listIterator();
+ AllocTypeMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocTypeMethodRef) itr.next();
+ if ( obj.getType().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 373,376 ****
--- 394,400 ----
/*
* $Log$
+ * Revision 1.17 2002/05/14 14:05:36 vachis
+ * "cross" methods
+ *
* Revision 1.16 2002/05/06 17:32:13 vachis
* new api implemention
Index: MonThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonThreadMethodData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** MonThreadMethodData.java 8 May 2002 08:08:57 -0000 1.7
--- MonThreadMethodData.java 14 May 2002 14:05:37 -0000 1.8
***************
*** 121,126 ****
*/
public MonThreadTraceRef getMonThreadTrace(MonTraceRef peer) {
return null;
- //PENDING
}
--- 121,133 ----
*/
public MonThreadTraceRef getMonThreadTrace(MonTraceRef peer) {
+ ListIterator itr = getMonThreadTraces().listIterator();
+ MonThreadTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (MonThreadTraceRef) itr.next();
+ if ( obj.getMonTrace().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 155,158 ****
--- 162,168 ----
/*
* $Log$
+ * Revision 1.8 2002/05/14 14:05:37 vachis
+ * "cross" methods
+ *
* Revision 1.7 2002/05/08 08:08:57 vachis
* siblings
Index: MonTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonTraceData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** MonTraceData.java 13 May 2002 21:25:56 -0000 1.10
--- MonTraceData.java 14 May 2002 14:05:37 -0000 1.11
***************
*** 83,87 ****
void addThread(MonThreadTraceData thread) {
monThreadTraces.add(thread);
- //pending MAP
}
--- 83,86 ----
***************
*** 135,140 ****
*/
public MonThreadTraceRef getMonThreadTrace(ThreadRef peer) {
return null;
- //PENDING
}
--- 134,146 ----
*/
public MonThreadTraceRef getMonThreadTrace(ThreadRef peer) {
+ ListIterator itr = getMonThreadTraces().listIterator();
+ MonThreadTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (MonThreadTraceRef) itr.next();
+ if ( obj.getThread().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 149,156 ****
public AllocTraceRef getSiblingAlloc() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! AllocTraceData trace;
while ( itr.hasNext() ) {
! trace = (AllocTraceData) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
--- 155,162 ----
public AllocTraceRef getSiblingAlloc() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! AllocTraceRef trace;
while ( itr.hasNext() ) {
! trace = (AllocTraceRef) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
***************
*** 167,174 ****
public CPUTraceRef getSiblingCPU() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! CPUTraceData trace;
while ( itr.hasNext() ) {
! trace = (CPUTraceData) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
--- 173,180 ----
public CPUTraceRef getSiblingCPU() {
ListIterator itr = getMethod().getCPUTraces().listIterator();
! CPUTraceRef trace;
while ( itr.hasNext() ) {
! trace = (CPUTraceRef) itr.next();
if ( getFrames().equals( trace.getFrames() ) )
return trace;
***************
*** 185,188 ****
--- 191,197 ----
/*
* $Log$
+ * Revision 1.11 2002/05/14 14:05:37 vachis
+ * "cross" methods
+ *
* Revision 1.10 2002/05/13 21:25:56 vachis
* use virtual methods in getting of siblings
Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** ThreadData.java 7 May 2002 21:11:38 -0000 1.20
--- ThreadData.java 14 May 2002 14:05:37 -0000 1.21
***************
*** 143,147 ****
void addType(AllocTypeThreadData allocType) {
allocTypeThreads.add(allocType);
- //pending MAP
}
--- 143,146 ----
***************
*** 153,157 ****
void addAllocMethod(AllocThreadMethodData method) {
allocThreadMethods.add(method);
- //pending MAP
}
--- 152,155 ----
***************
*** 163,167 ****
void addCPUMethod(CPUThreadMethodData method) {
cpuThreadMethods.add(method);
- //pending MAP
}
--- 161,164 ----
***************
*** 173,177 ****
void addMonMethod(MonThreadMethodData method) {
monThreadMethods.add(method);
- //pending MAP
}
--- 170,173 ----
***************
*** 183,187 ****
void addAllocTrace(AllocThreadTraceData trace) {
allocThreadTraces.add(trace);
- //pending MAP
}
--- 179,182 ----
***************
*** 193,197 ****
void addCPUTrace(CPUThreadTraceData trace) {
cpuThreadTraces.add(trace);
- //pending MAP
}
--- 188,191 ----
***************
*** 203,211 ****
void addMonTrace(MonThreadTraceData trace) {
monThreadTraces.add(trace);
- //pending MAP
}
!
! //PENDING MAP
!
/** Set tree of method calls in this thread.
* @param root Root of call tree for this thread
--- 197,202 ----
void addMonTrace(MonThreadTraceData trace) {
monThreadTraces.add(trace);
}
!
/** Set tree of method calls in this thread.
* @param root Root of call tree for this thread
***************
*** 294,299 ****
*/
public AllocThreadMethodRef getAllocThreadMethod(MethodRef peer) {
return null;
- //PENDING
}
--- 285,297 ----
*/
public AllocThreadMethodRef getAllocThreadMethod(MethodRef peer) {
+ ListIterator itr = getAllocThreadMethods().listIterator();
+ AllocThreadMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocThreadMethodRef) itr.next();
+ if ( obj.getMethod().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 316,321 ****
*/
public AllocThreadTraceRef getAllocThreadTrace(AllocTraceRef peer) {
return null;
- //PENDING
}
--- 314,326 ----
*/
public AllocThreadTraceRef getAllocThreadTrace(AllocTraceRef peer) {
+ ListIterator itr = getAllocThreadTraces().listIterator();
+ AllocThreadTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocThreadTraceRef) itr.next();
+ if ( obj.getAllocTrace().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 338,343 ****
*/
public AllocTypeThreadRef getAllocTypeThread(TypeRef peer) {
return null;
- //PENDING
}
--- 343,355 ----
*/
public AllocTypeThreadRef getAllocTypeThread(TypeRef peer) {
+ ListIterator itr = getAllocTypeThreads().listIterator();
+ AllocTypeThreadRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocTypeThreadRef) itr.next();
+ if ( obj.getType().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 360,365 ****
*/
public CPUThreadMethodRef getCPUThreadMethod(MethodRef peer) {
return null;
- //PENDING
}
--- 372,384 ----
*/
public CPUThreadMethodRef getCPUThreadMethod(MethodRef peer) {
+ ListIterator itr = getCPUThreadMethods().listIterator();
+ CPUThreadMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (CPUThreadMethodRef) itr.next();
+ if ( obj.getMethod().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 382,387 ****
*/
public CPUThreadTraceRef getCPUThreadTrace(CPUTraceRef peer) {
return null;
- //PENDING
}
--- 401,413 ----
*/
public CPUThreadTraceRef getCPUThreadTrace(CPUTraceRef peer) {
+ ListIterator itr = getCPUThreadTraces().listIterator();
+ CPUThreadTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (CPUThreadTraceRef) itr.next();
+ if ( obj.getCPUTrace().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 404,409 ****
*/
public MonThreadMethodRef getMonThreadMethod(MethodRef peer) {
return null;
- //PENDING
}
--- 430,442 ----
*/
public MonThreadMethodRef getMonThreadMethod(MethodRef peer) {
+ ListIterator itr = getMonThreadMethods().listIterator();
+ MonThreadMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (MonThreadMethodRef) itr.next();
+ if ( obj.getMethod().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 426,431 ****
*/
public MonThreadTraceRef getMonThreadTrace(MonTraceRef peer) {
return null;
- //PENDING
}
--- 459,471 ----
*/
public MonThreadTraceRef getMonThreadTrace(MonTraceRef peer) {
+ ListIterator itr = getMonThreadTraces().listIterator();
+ MonThreadTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (MonThreadTraceRef) itr.next();
+ if ( obj.getMonTrace().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 453,456 ****
--- 493,499 ----
/*
* $Log$
+ * Revision 1.21 2002/05/14 14:05:37 vachis
+ * "cross" methods
+ *
* Revision 1.20 2002/05/07 21:11:38 vachis
* fix creation of fields, frames
Index: TypeData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/TypeData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TypeData.java 6 May 2002 17:33:01 -0000 1.1
--- TypeData.java 14 May 2002 14:05:37 -0000 1.2
***************
*** 136,140 ****
void addMethod(AllocTypeMethodData method) {
allocTypeMethods.add(method);
- //pending MAP
}
--- 136,139 ----
***************
*** 146,150 ****
void addThread(AllocTypeThreadData thread) {
allocTypeThreads.add(thread);
- //pending MAP
}
--- 145,148 ----
***************
*** 156,160 ****
void addTrace(AllocTypeTraceData trace) {
allocTypeTraces.add(trace);
- //pending MAP
}
--- 154,157 ----
***************
*** 210,215 ****
*/
public AllocTypeTraceRef getAllocTypeTrace(AllocTraceRef peer) {
return null;
- //PENDING;
}
--- 207,219 ----
*/
public AllocTypeTraceRef getAllocTypeTrace(AllocTraceRef peer) {
+ ListIterator itr = getAllocTypeTraces().listIterator();
+ AllocTypeTraceRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocTypeTraceRef) itr.next();
+ if ( obj.getAllocTrace().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 231,236 ****
*/
public AllocTypeMethodRef getAllocTypeMethod(MethodRef peer) {
return null;
- //PENDING;
}
--- 235,247 ----
*/
public AllocTypeMethodRef getAllocTypeMethod(MethodRef peer) {
+ ListIterator itr = getAllocTypeMethods().listIterator();
+ AllocTypeMethodRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocTypeMethodRef) itr.next();
+ if ( obj.getMethod().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 253,258 ****
*/
public AllocTypeThreadRef getAllocTypeThread(ThreadRef peer) {
return null;
- //PENDING;
}
--- 264,276 ----
*/
public AllocTypeThreadRef getAllocTypeThread(ThreadRef peer) {
+ ListIterator itr = getAllocTypeThreads().listIterator();
+ AllocTypeThreadRef obj;
+
+ while (itr.hasNext()) {
+ obj = (AllocTypeThreadRef) itr.next();
+ if ( obj.getThread().equals( peer ) )
+ return obj;
+ }
return null;
}
***************
*** 264,267 ****
--- 282,288 ----
/*
* $Log$
+ * Revision 1.2 2002/05/14 14:05:37 vachis
+ * "cross" methods
+ *
* Revision 1.1 2002/05/06 17:33:01 vachis
* new api implemention
|
