[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data AllocTraceData.java,1.17,1.18 CPUTraceData.java,1.11,1.12 FrameData.java,1.1,1.2 MonTraceData.java,1.8,1.9

[Pavel V. <va...@us...>]

Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv11501

Modified Files:
	AllocTraceData.java CPUTraceData.java FrameData.java 
	MonTraceData.java 
Log Message:
siblings

Index: AllocTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTraceData.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** AllocTraceData.java	7 May 2002 21:11:38 -0000	1.17
--- AllocTraceData.java	13 May 2002 20:04:17 -0000	1.18
***************
*** 171,175 ****
       */
      public AllocTypeTraceRef getAllocTypeTrace(TypeRef peer) {
!         return null;
          //PENDING
      }
--- 171,175 ----
       */
      public AllocTypeTraceRef getAllocTypeTrace(TypeRef peer) {
!         return null; 
          //PENDING
      }
***************
*** 184,189 ****
       */
      public CPUTraceRef getSiblingCPU() {
          return null;
-         //PENDING
      }
      
--- 184,196 ----
       */
      public CPUTraceRef getSiblingCPU() {
+         ListIterator itr = getMethod().getCPUTraces().listIterator();
+         CPUTraceData trace;
+         
+         while ( itr.hasNext() ) {
+             trace =  (CPUTraceData) itr.next();
+             if ( frames.equals( trace.getFrames() ) )
+                 return trace;
+         }
          return null;
      }
      
***************
*** 195,200 ****
       */    
      public MonTraceRef getSiblingMon() {
          return null;
-         //PENDING
      }
  
--- 202,214 ----
       */    
      public MonTraceRef getSiblingMon() {
+         ListIterator itr = getMethod().getCPUTraces().listIterator();
+         MonTraceData trace;
+         
+         while ( itr.hasNext() ) {
+             trace =  (MonTraceData) itr.next();
+             if ( frames.equals( trace.getFrames() ) )
+                 return trace;
+         }
          return null;
      }
  
***************
*** 207,210 ****
--- 221,227 ----
  /*
   * $Log$
+  * Revision 1.18  2002/05/13 20:04:17  vachis
+  * siblings
+  *
   * Revision 1.17  2002/05/07 21:11:38  vachis
   * fix creation of fields, frames

Index: CPUTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUTraceData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** CPUTraceData.java	7 May 2002 21:11:38 -0000	1.11
--- CPUTraceData.java	13 May 2002 20:04:17 -0000	1.12
***************
*** 148,153 ****
       */
      public AllocTraceRef getSiblingAlloc() {
          return null;
-         //PENDING
      }
      
--- 148,160 ----
       */
      public AllocTraceRef getSiblingAlloc() {
+         ListIterator itr = getMethod().getCPUTraces().listIterator();
+         AllocTraceData trace;
+         
+         while ( itr.hasNext() ) {
+             trace =  (AllocTraceData) itr.next();
+             if ( frames.equals( trace.getFrames() ) )
+                 return trace;
+         }
          return null;
      }
      
***************
*** 159,164 ****
       */    
      public MonTraceRef getSiblingMon() {
          return null;
-         //PENDING
      }
      
--- 166,178 ----
       */    
      public MonTraceRef getSiblingMon() {
+         ListIterator itr = getMethod().getCPUTraces().listIterator();
+         MonTraceData trace;
+         
+         while ( itr.hasNext() ) {
+             trace =  (MonTraceData) itr.next();
+             if ( frames.equals( trace.getFrames() ) )
+                 return trace;
+         }
          return null;
      }
      
***************
*** 171,174 ****
--- 185,191 ----
  /*
   * $Log$
+  * Revision 1.12  2002/05/13 20:04:17  vachis
+  * siblings
+  *
   * Revision 1.11  2002/05/07 21:11:38  vachis
   * fix creation of fields, frames

Index: FrameData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/FrameData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FrameData.java	6 May 2002 17:33:01 -0000	1.1
--- FrameData.java	13 May 2002 20:04:17 -0000	1.2
***************
*** 81,88 ****
--- 81,128 ----
          return getMethod() + ":" + getLineNo();
      }
+     
+     public boolean equals(Object obj) {
+         if ( obj == null )
+             return false;
+         
+         FrameData o = (FrameData) obj;
+         if ( this.line != o.line )
+             return false;
+         
+         if ( this.method == null ) {
+             if (o.method != null )
+                 return false;
+         }
+         else {
+             if ( !this.method.equals( o.method ) )
+             return false;
+         }
+             
+         if ( this.caller == null ) {
+             if ( o.caller != null )
+                 return false;
+         }
+         else {
+            if ( !this.caller.equals( o.caller ) )
+             return false;
+         }
+         
+         return true;
+     }
+     
+     public int hashCode() {
+         /*return (method.hashCode() & 0xFFFFFFFF) << 8 +
+                (caller.hashCode() & 0xFFFFFF) << 6 +
+                (line & 0xFF);*/
+         return method.hashCode() + caller.hashCode() + line;
+     }
+     
  }
  
  /*
   * $Log$
+  * Revision 1.2  2002/05/13 20:04:17  vachis
+  * siblings
+  *
   * Revision 1.1  2002/05/06 17:33:01  vachis
   * new api implemention

Index: MonTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonTraceData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** MonTraceData.java	7 May 2002 21:11:38 -0000	1.8
--- MonTraceData.java	13 May 2002 20:04:17 -0000	1.9
***************
*** 148,153 ****
       */
      public AllocTraceRef getSiblingAlloc() {
          return null;
-         //PENDING
      }
      
--- 148,160 ----
       */
      public AllocTraceRef getSiblingAlloc() {
+         ListIterator itr = getMethod().getCPUTraces().listIterator();
+         AllocTraceData trace;
+         
+         while ( itr.hasNext() ) {
+             trace =  (AllocTraceData) itr.next();
+             if ( frames.equals( trace.getFrames() ) )
+                 return trace;
+         }
          return null;
      }
      
***************
*** 159,164 ****
       */
      public CPUTraceRef getSiblingCPU() {
          return null;
-         //PENDING
      }
      
--- 166,178 ----
       */
      public CPUTraceRef getSiblingCPU() {
+         ListIterator itr = getMethod().getCPUTraces().listIterator();
+         CPUTraceData trace;
+         
+         while ( itr.hasNext() ) {
+             trace =  (CPUTraceData) itr.next();
+             if ( frames.equals( trace.getFrames() ) )
+                 return trace;
+         }
          return null;
      }
      
***************
*** 171,174 ****
--- 185,191 ----
  /*
   * $Log$
+  * Revision 1.9  2002/05/13 20:04:17  vachis
+  * siblings
+  *
   * Revision 1.8  2002/05/07 21:11:38  vachis
   * fix creation of fields, frames