[Javaprofiler-commits] CVS: library/src/alloc allocObjectMethod.cpp,1.12,1.13 allocObjectTrace.cpp,1.12,1.13 allocThreadObject.cpp,1.14,1.15

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

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

Modified Files:
	allocObjectMethod.cpp allocObjectTrace.cpp 
	allocThreadObject.cpp 
Log Message:
fixes;
calltree implementation (for exact cpu profiling)


Index: allocObjectMethod.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocObjectMethod.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** allocObjectMethod.cpp	21 Nov 2001 22:31:41 -0000	1.12
--- allocObjectMethod.cpp	10 Feb 2002 18:36:13 -0000	1.13
***************
*** 73,77 ****
  void AllocObjectMethod::deactivate() {
  
! 	Prof::prof().activeAllocObjectMethods.removeNoRehash(this); 
  
  	AllocObjectTrace* ot = objectTraces.first();
--- 73,77 ----
  void AllocObjectMethod::deactivate() {
  
! 	Prof::prof().activeAllocObjectMethods.removeNoRehash(this);
  
  	AllocObjectTrace* ot = objectTraces.first();
***************
*** 96,100 ****
  int AllocObjectMethod::hashKey(const AllocObjectMethodKey& key) {
  
! 	return AllocObject::hashKey(key.objectKey) ^ Method::hashKey(key.methodId);
  }
  
--- 96,100 ----
  int AllocObjectMethod::hashKey(const AllocObjectMethodKey& key) {
  
! 	return Method::hashKey(key.methodId); // don't use AllocObject::hashKey() for hashing !!!
  }
  

Index: allocObjectTrace.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocObjectTrace.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** allocObjectTrace.cpp	21 Nov 2001 22:31:41 -0000	1.12
--- allocObjectTrace.cpp	10 Feb 2002 18:36:13 -0000	1.13
***************
*** 91,95 ****
  int AllocObjectTrace::hashKey(const AllocObjectTraceKey& key) {
  
! 	return AllocObject::hashKey(key.objectKey) ^ Trace::hashKey(key.traceKey);
  }
  
--- 91,95 ----
  int AllocObjectTrace::hashKey(const AllocObjectTraceKey& key) {
  
! 	return Trace::hashKey(key.traceKey); // don't use AllocObject::hashKey() for hashing !!!
  }
  

Index: allocThreadObject.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocThreadObject.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** allocThreadObject.cpp	21 Nov 2001 22:31:41 -0000	1.14
--- allocThreadObject.cpp	10 Feb 2002 18:36:13 -0000	1.15
***************
*** 96,100 ****
  int AllocThreadObject::hashKey(const AllocThreadObjectKey& key) {
  
! 	return Thread::hashKey(key.envId) ^ AllocObject::hashKey(key.objectKey);
  }
  
--- 96,100 ----
  int AllocThreadObject::hashKey(const AllocThreadObjectKey& key) {
  
! 	return Thread::hashKey(key.envId); // don't use AllocObject::hashKey() for hashing !!!
  }