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

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

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

Modified Files:
	includes.h main.cpp 
Log Message:
no message

Index: includes.h
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/main/includes.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** includes.h	2001/08/05 01:37:10	1.19
--- includes.h	2001/08/09 23:22:55	1.20
***************
*** 60,63 ****
--- 60,65 ----
  class Prof;
  
+ class Setup;
+ 
  #include "../main/main.h"
  #include "../main/const.h"
***************
*** 66,69 ****
--- 68,73 ----
  #include "../prof/lock.h"
  #include "../prof/synchronized.h"
+ #include "../commun3/semaphore.h"
+ #include "../commun3/sharedMemory.h"
  
  #include "../list/refCount.h"
***************
*** 76,79 ****
--- 80,84 ----
  #include "../commun/commun.h"
  #include "../commun/communSocket.h"
+ #include "../commun3/communShMem.h"
  #include "../commun/statDataModification.h"
  #include "../commun2/objectTable.h"
***************
*** 117,121 ****
  #include "../gc/gc.h"
  
- #include "../setup/setup.h"
  #include "../commun/iprof.h"
  #include "../prof/prof.h"
--- 122,126 ----
  #include "../gc/gc.h"
  
  #include "../commun/iprof.h"
+ #include "../setup/setup.h"
  #include "../prof/prof.h"

Index: main.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/main/main.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** main.cpp	2001/08/01 22:53:26	1.19
--- main.cpp	2001/08/09 23:22:55	1.20
***************
*** 57,69 ****
  JNIEXPORT jint JNICALL JVM_OnLoad( JavaVM* jvm, char* options, void* reserved) {
  
- 	_prof = new Prof;
- 
  	JVMPI_Interface* jvmpi_interface;
  	if( jvm->GetEnv( (void**)&jvmpi_interface, JVMPI_VERSION_1) < 0) return JNI_ERR;
  
  	jvmpi_interface->NotifyEvent = profNotifyEvent;
  	_prof->jvmpiInterface = jvmpi_interface;
- 
- 	_prof->setup.processOptions(options);  
  
  	jvmpi_interface->EnableEvent( JVMPI_EVENT_THREAD_END,   NULL);
--- 57,67 ----
  JNIEXPORT jint JNICALL JVM_OnLoad( JavaVM* jvm, char* options, void* reserved) {
  
  	JVMPI_Interface* jvmpi_interface;
  	if( jvm->GetEnv( (void**)&jvmpi_interface, JVMPI_VERSION_1) < 0) return JNI_ERR;
  
+ 	_prof = new Prof( *(new Setup( options)));
+ 
  	jvmpi_interface->NotifyEvent = profNotifyEvent;
  	_prof->jvmpiInterface = jvmpi_interface;
  
  	jvmpi_interface->EnableEvent( JVMPI_EVENT_THREAD_END,   NULL);