[Javaprofiler-commits] CVS: library/src/main includes.h,1.21,1.22 main.cpp,1.20,1.21

[Petr L. <lu...@us...>]

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

Modified Files:
	includes.h main.cpp 
Log Message:
Monitor profiling

Index: includes.h
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/main/includes.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** includes.h	2001/08/23 23:57:31	1.21
--- includes.h	2001/08/24 17:54:04	1.22
***************
*** 55,58 ****
--- 55,65 ----
  class CpuThreadTrace;
  
+ struct MonThreadMethodKey;
+ struct MonThreadTraceKey;
+ 
+ class MonTrace;
+ class MonThreadMethod;
+ class MonThreadTrace;
+ 
  class AllocInstance;
  
***************
*** 90,93 ****
--- 97,101 ----
  #include "../alloc/allocAbstractStatThreadObject.h"
  #include "../cpu/cpuStatData.h"
+ #include "../mon/monStatData.h"
  
  #include "../cpu/cpuStack.h"
***************
*** 115,118 ****
--- 123,130 ----
  #include "../cpu/cpuThreadMethod.h"
  #include "../cpu/cpuThreadTrace.h"
+ 
+ #include "../mon/monTrace.h"
+ #include "../mon/monThreadMethod.h"
+ #include "../mon/monThreadTrace.h"
  
  #include "../alloc/allocArena.h"

Index: main.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/main/main.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** main.cpp	2001/08/09 23:22:55	1.20
--- main.cpp	2001/08/24 17:54:04	1.21
***************
*** 97,106 ****
  	}
  
! //	jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_CONTENDED_ENTER,   NULL);
! //	jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_CONTENDED_ENTERED, NULL);
! //	jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_CONTENDED_EXIT,    NULL);
  
! //	jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_WAIT,   NULL);
! //	jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_WAITED, NULL);
  
  //	jvmpi_interface->EnableEvent( JVMPI_EVENT_RAW_MONITOR_CONTENDED_ENTER,   NULL);
--- 97,109 ----
  	}
  
! 	if( _prof->setup.mon.turnedOn) {  
  
! 		jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_CONTENDED_ENTER,   NULL);
! 		jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_CONTENDED_ENTERED, NULL);
! 	//	jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_CONTENDED_EXIT,    NULL);
! 
! 	//	jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_WAIT,   NULL);
! 		jvmpi_interface->EnableEvent( JVMPI_EVENT_MONITOR_WAITED, NULL);
! 	}
  
  //	jvmpi_interface->EnableEvent( JVMPI_EVENT_RAW_MONITOR_CONTENDED_ENTER,   NULL);