[Javaprofiler-commits] CVS: library/src/calltree callTree.cpp,1.1,1.2 callTreeItem.cpp,1.1,1.2

[Marek P. <ma...@us...>]

Update of /cvsroot/javaprofiler/library/src/calltree
In directory usw-pr-cvs1:/tmp/cvs-serv5925/src/calltree

Modified Files:
	callTree.cpp callTreeItem.cpp 
Log Message:
fixes;
calltree implementation (for exact cpu profiling)


Index: callTree.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/calltree/callTree.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** callTree.cpp	31 Jan 2002 12:30:59 -0000	1.1
--- callTree.cpp	10 Feb 2002 18:36:13 -0000	1.2
***************
*** 61,67 ****
  		while( p) {
  
- 			p->getBinaryData( b);
- 
  			q = p;
  			p = p->children.first();
  		}
--- 61,69 ----
  		while( p) {
  
  			q = p;
+ 
+ 			if( p->method) p->getBinaryData( b);
+ 			else break;
+ 
  			p = p->children.first();
  		}

Index: callTreeItem.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/calltree/callTreeItem.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** callTreeItem.cpp	31 Jan 2002 12:30:59 -0000	1.1
--- callTreeItem.cpp	10 Feb 2002 18:36:13 -0000	1.2
***************
*** 49,52 ****
  	b += method->getProfID();
  
! 	b += (jint)children.length();
  }
--- 49,61 ----
  	b += method->getProfID();
  
! 	jint count = 0;
! 	CallTreeItem* p = children.first();
! 
! 	while( p) {
! 
! 		if( p->method) count++;
! 		p = children.next( p);
! 	}
! 
! 	b += count;
  }