|
From: Marek P. <ma...@us...> - 2001-08-27 23:08:44
|
Update of /cvsroot/javaprofiler/library/src/commun
In directory usw-pr-cvs1:/tmp/cvs-serv27021/src/commun
Modified Files:
iprof.cpp iprof.h
Log Message:
extension of communication interface for possibility
to transfer information about Java monitors
Index: iprof.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun/iprof.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** iprof.cpp 2001/08/23 23:57:31 1.6
--- iprof.cpp 2001/08/27 23:08:41 1.7
***************
*** 38,42 ****
conEstabl = 1;
- Delay d;
Buffer buf;
while( 1) {
--- 38,41 ----
***************
*** 52,56 ****
if( _commun->hasFailed()) return (conEstabl = 0);
! d.delay( 10);
}
--- 51,55 ----
if( _commun->hasFailed()) return (conEstabl = 0);
! Delay::delay( 10);
}
***************
*** 142,147 ****
b += data.active;
! if( type == ALLOC_DATA) data.alloc.dataToBin( b);
! else data.cpu.dataToBin( b); // CPU_DATA
}
--- 141,147 ----
b += data.active;
! if( type == ALLOC_DATA) data.alloc.dataToBin( b);
! else if( type == CPU_DATA) data.cpu .dataToBin( b);
! else data.mon .dataToBin( b); // MON_DATA
}
***************
*** 154,157 ****
--- 154,158 ----
b += s->objId;
b += s->active;
+
b += s->hasAllocData;
***************
*** 161,164 ****
--- 162,169 ----
if( s->hasCpuData) s->cpu.dataToBin( b);
+
+ b += s->hasMonData;
+
+ if( s->hasMonData) s->mon.dataToBin( b);
return 0;
Index: iprof.h
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun/iprof.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** iprof.h 2001/08/23 23:57:31 1.9
--- iprof.h 2001/08/27 23:08:41 1.10
***************
*** 160,164 ****
/// cpu profiling statistics
! CPU_DATA = 1
};
--- 160,167 ----
/// cpu profiling statistics
! CPU_DATA = 1,
!
! /// monitor profiling statistics
! MON_DATA = 2
};
***************
*** 174,177 ****
--- 177,183 ----
/// cpu profiling data (if exist)
CpuStatData cpu;
+
+ /// monitor profiling data (if exist)
+ MonStatData mon;
};
***************
*** 211,214 ****
--- 217,226 ----
CpuStatData cpu;
+ /// monitor profiling data are included or not
+ jint hasMonData;
+
+ /// monitor profiling data (if exist)
+ MonStatData mon;
+
private:
***************
*** 332,336 ****
/// method traces of concrete method called in given thread
! CPU_THREAD_METHOD_TRACES = 32
};
--- 344,366 ----
/// method traces of concrete method called in given thread
! CPU_THREAD_METHOD_TRACES = 32,
!
! /// method traces of given method (monitor profiling)
! MON_METHOD_TRACES = 33,
!
! /// threads where given method was called
! MON_METHOD_THREADS = 34,
!
! /// threads for concrete method trace
! MON_METHOD_TRACE_THREADS = 35,
!
! /// methods called in given thread
! MON_THREAD_METHODS = 36,
!
! /// method traces of concrete method called in given thread
! MON_THREAD_METHOD_TRACES = 37,
!
! /// method traces (monitor profiling)
! MON_TRACES = 38
};
|