[Javaprofiler-commits] CVS: library/src/cpu cpuStatData.cpp,1.7,1.8 cpuThreadMethod.cpp,1.8,1.9 cpuTrace.cpp,1.8,1.9 sampling.cpp,1.12,1.13

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

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

Modified Files:
	cpuStatData.cpp cpuThreadMethod.cpp cpuTrace.cpp sampling.cpp 
Log Message:
fixes

Index: cpuStatData.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/cpu/cpuStatData.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cpuStatData.cpp	21 Nov 2001 22:31:42 -0000	1.7
--- cpuStatData.cpp	8 Apr 2002 23:30:01 -0000	1.8
***************
*** 37,40 ****
--- 37,42 ----
  void CpuStatData::addCpuStat(jlong addHits, jlong addPureTime) {
  
+ 	if( addHits < 0) return;
+ 
  	hits += addHits;
  	pureTime += addPureTime;

Index: cpuThreadMethod.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/cpu/cpuThreadMethod.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** cpuThreadMethod.cpp	21 Nov 2001 22:31:42 -0000	1.8
--- cpuThreadMethod.cpp	8 Apr 2002 23:30:01 -0000	1.9
***************
*** 44,49 ****
  void CpuThreadMethod::addCpuStat(jlong addHits, jlong addPureTime) {
  
  	CpuStatData::addCpuStat(addHits, addPureTime);
! 	method->addCpuStat(addHits, addPureTime);
  }
  
--- 44,60 ----
  void CpuThreadMethod::addCpuStat(jlong addHits, jlong addPureTime) {
  
+ 	if( addHits < 0) {
+ 
+ 		method->cpumonModif = 0;
+ 		return;
+ 	}
+ 
  	CpuStatData::addCpuStat(addHits, addPureTime);
! 
! 	if( !method->cpumonModif) {
! 
! 		method->addCpuStat(addHits, addPureTime);
! 		method->cpumonModif = 1;
! 	}
  }
  

Index: cpuTrace.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/cpu/cpuTrace.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** cpuTrace.cpp	21 Nov 2001 22:31:42 -0000	1.8
--- cpuTrace.cpp	8 Apr 2002 23:30:01 -0000	1.9
***************
*** 43,48 ****
  void CpuTrace::addCpuStat(jlong addHits, jlong addPureTime) {
  
  	CpuStatData::addCpuStat(addHits, addPureTime);
! 	method->addCpuStat(addHits, addPureTime);
  }
  
--- 43,59 ----
  void CpuTrace::addCpuStat(jlong addHits, jlong addPureTime) {
  
+ 	if( addHits < 0) {
+ 
+ 		method->cpumonModif = 0;
+ 		return;
+ 	}
+ 
  	CpuStatData::addCpuStat(addHits, addPureTime);
! 
! 	if( !method->cpumonModif) {
! 
! 		method->addCpuStat(addHits, addPureTime);
! 		method->cpumonModif = 1;
! 	}
  }
  

Index: sampling.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/cpu/sampling.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** sampling.cpp	22 Mar 2002 21:24:16 -0000	1.12
--- sampling.cpp	8 Apr 2002 23:30:01 -0000	1.13
***************
*** 488,491 ****
--- 488,492 ----
  				
  				stat->addCpuStat((jlong)1, (jlong)0);
+ 				stat->addCpuStat( -1, 0);
  			}
  		}