[Javaprofiler-commits] CVS: library/src/alloc allocObject.cpp,1.13,1.14 allocObjectMethod.cpp,1.13,1.14 allocObjectTrace.cpp,1.13,1.14 allocThreadMethod.cpp,1.10,1.11 allocThreadObject.cpp,1.15,1.16 allocThreadObjectMethod.cpp,1.14,1.15 allocThreadObjectTrace.cpp,1.13,1.14 allocThreadTrace.cpp,1.10,1.11 allocTrace.cpp,1.10,1.11

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

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

Modified Files:
	allocObject.cpp allocObjectMethod.cpp allocObjectTrace.cpp 
	allocThreadMethod.cpp allocThreadObject.cpp 
	allocThreadObjectMethod.cpp allocThreadObjectTrace.cpp 
	allocThreadTrace.cpp allocTrace.cpp 
Log Message:
serious bug fixes - monitors, deactivating...
interface version checking added
new test program for testing of memory profiling added

Index: allocObject.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocObject.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** allocObject.cpp	21 Nov 2001 22:31:41 -0000	1.13
--- allocObject.cpp	15 Apr 2002 21:04:17 -0000	1.14
***************
*** 70,79 ****
  void AllocObject::deactivate() {
  
! 	Prof::prof().activeAllocObjects.removeNoRehash(this); 
  
  	AllocObjectMethod* om = objectMethods.first();
! 	while (om) { 
  		om->deactivate();
! 		om = objectMethods.next(om);
  	}
  }
--- 70,87 ----
  void AllocObject::deactivate() {
  
! 	Prof::prof().activeAllocObjects.removeNoRehash( this);
  
  	AllocObjectMethod* om = objectMethods.first();
! 	while( om) {
! 
  		om->deactivate();
! 		om = objectMethods.next( om);
! 	}
! 
! 	AllocThreadObject* to = threadObjects.first();
! 	while( to) {
! 
! 		to->deactivate();
! 		to = threadObjects.next( to);
  	}
  }

Index: allocObjectMethod.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocObjectMethod.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** allocObjectMethod.cpp	10 Feb 2002 18:36:13 -0000	1.13
--- allocObjectMethod.cpp	15 Apr 2002 21:04:17 -0000	1.14
***************
*** 73,82 ****
  void AllocObjectMethod::deactivate() {
  
! 	Prof::prof().activeAllocObjectMethods.removeNoRehash(this);
  
  	AllocObjectTrace* ot = objectTraces.first();
! 	while (ot) { 
  		ot->deactivate();
! 		ot = objectTraces.next(ot);
  	}
  }
--- 73,90 ----
  void AllocObjectMethod::deactivate() {
  
! 	Prof::prof().activeAllocObjectMethods.removeNoRehash( this);
! 
! 	AllocThreadObjectMethod* tom = threadObjectMethods.first();
! 	while( tom) {
! 
! 		tom->deactivate();
! 		tom = threadObjectMethods.next( tom);
! 	}
  
  	AllocObjectTrace* ot = objectTraces.first();
! 	while( ot) {
! 
  		ot->deactivate();
! 		ot = objectTraces.next( ot);
  	}
  }

Index: allocObjectTrace.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocObjectTrace.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** allocObjectTrace.cpp	10 Feb 2002 18:36:13 -0000	1.13
--- allocObjectTrace.cpp	15 Apr 2002 21:04:17 -0000	1.14
***************
*** 74,78 ****
  void AllocObjectTrace::deactivate() {
  
! 	Prof::prof().activeAllocObjectTraces.removeNoRehash(this); 
  }
  
--- 74,85 ----
  void AllocObjectTrace::deactivate() {
  
! 	Prof::prof().activeAllocObjectTraces.removeNoRehash( this);
! 
! 	AllocThreadObjectTrace* tot = threadObjectTraces.first();
! 	while( tot) {
! 
! 		tot->deactivate();
! 		tot = threadObjectTraces.next( tot);
! 	}
  }
  

Index: allocThreadMethod.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocThreadMethod.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** allocThreadMethod.cpp	21 Nov 2001 22:31:41 -0000	1.10
--- allocThreadMethod.cpp	15 Apr 2002 21:04:17 -0000	1.11
***************
*** 43,52 ****
  void AllocThreadMethod::deactivate() {
  
! 	Prof::prof().activeAllocThreadMethods.removeNoRehash(this);
  
  	AllocThreadTrace* tt = threadTraces.first();
! 	while (tt) { 
  		tt->deactivate();
! 		tt = threadTraces.next(tt);
  	}
  }
--- 43,60 ----
  void AllocThreadMethod::deactivate() {
  
! 	Prof::prof().activeAllocThreadMethods.removeNoRehash( this);
! 
! 	AllocThreadObjectMethod* tom = threadObjectMethods.first();
! 	while( tom) {
! 
! 		tom->deactivate();
! 		tom = threadObjectMethods.next( tom);
! 	}
  
  	AllocThreadTrace* tt = threadTraces.first();
! 	while( tt) {
! 
  		tt->deactivate();
! 		tt = threadTraces.next( tt);
  	}
  }

Index: allocThreadObject.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocThreadObject.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** allocThreadObject.cpp	10 Feb 2002 18:36:13 -0000	1.15
--- allocThreadObject.cpp	15 Apr 2002 21:04:17 -0000	1.16
***************
*** 73,82 ****
  void AllocThreadObject::deactivate() {
  
! 	Prof::prof().activeAllocThreadObjects.removeNoRehash(this); 
  
  	AllocThreadObjectMethod* tom = threadObjectMethods.first();
! 	while (tom) { 
  		tom->deactivate();
! 		tom = threadObjectMethods.next(tom);
  	}
  }
--- 73,83 ----
  void AllocThreadObject::deactivate() {
  
! 	Prof::prof().activeAllocThreadObjects.removeNoRehash( this);
  
  	AllocThreadObjectMethod* tom = threadObjectMethods.first();
! 	while( tom) {
! 
  		tom->deactivate();
! 		tom = threadObjectMethods.next( tom);
  	}
  }

Index: allocThreadObjectMethod.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocThreadObjectMethod.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** allocThreadObjectMethod.cpp	21 Nov 2001 22:31:41 -0000	1.14
--- allocThreadObjectMethod.cpp	15 Apr 2002 21:04:17 -0000	1.15
***************
*** 78,87 ****
  void AllocThreadObjectMethod::deactivate() {
  
! 	Prof::prof().activeAllocThreadObjectMethods.removeNoRehash(this); 
  
  	AllocThreadObjectTrace* tot = threadObjectTraces.first();
! 	while (tot) { 
  		tot->deactivate();
! 		tot = threadObjectTraces.next(tot);
  	}
  }
--- 78,88 ----
  void AllocThreadObjectMethod::deactivate() {
  
! 	Prof::prof().activeAllocThreadObjectMethods.removeNoRehash( this);
  
  	AllocThreadObjectTrace* tot = threadObjectTraces.first();
! 	while( tot) {
! 
  		tot->deactivate();
! 		tot = threadObjectTraces.next( tot);
  	}
  }

Index: allocThreadObjectTrace.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocThreadObjectTrace.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** allocThreadObjectTrace.cpp	21 Nov 2001 22:31:41 -0000	1.13
--- allocThreadObjectTrace.cpp	15 Apr 2002 21:04:17 -0000	1.14
***************
*** 78,82 ****
  void AllocThreadObjectTrace::deactivate() {
  
! 	Prof::prof().activeAllocThreadObjectTraces.removeNoRehash(this); 
  }
  
--- 78,82 ----
  void AllocThreadObjectTrace::deactivate() {
  
! 	Prof::prof().activeAllocThreadObjectTraces.removeNoRehash( this);
  }
  

Index: allocThreadTrace.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocThreadTrace.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** allocThreadTrace.cpp	21 Nov 2001 22:31:41 -0000	1.10
--- allocThreadTrace.cpp	15 Apr 2002 21:04:17 -0000	1.11
***************
*** 44,48 ****
  void AllocThreadTrace::deactivate() {
  
! 	Prof::prof().activeAllocThreadTraces.removeNoRehash(this); 
  }
  
--- 44,55 ----
  void AllocThreadTrace::deactivate() {
  
! 	Prof::prof().activeAllocThreadTraces.removeNoRehash( this);
! 
! 	AllocThreadObjectTrace* tot = threadObjectTraces.first();
! 	while( tot) {
! 
! 		tot->deactivate();
! 		tot = threadObjectTraces.next( tot);
! 	}
  }
  

Index: allocTrace.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/alloc/allocTrace.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** allocTrace.cpp	21 Nov 2001 22:31:41 -0000	1.10
--- allocTrace.cpp	15 Apr 2002 21:04:17 -0000	1.11
***************
*** 42,46 ****
  void AllocTrace::deactivate() {
  
! 	Prof::prof().activeAllocTraces.removeNoRehash(this);
  }
  
--- 42,60 ----
  void AllocTrace::deactivate() {
  
! 	Prof::prof().activeAllocTraces.removeNoRehash( this);
! 
! 	AllocThreadTrace* tt = threadTraces.first();
! 	while( tt) {
! 
! 		tt->deactivate();
! 		tt = threadTraces.next( tt);
! 	}
! 
! 	AllocObjectTrace* ot = objectTraces.first();
! 	while( ot) {
! 
! 		ot->deactivate();
! 		ot = objectTraces.next( ot);
! 	}
  }