Menu
▾
▴
javaprofiler-commits — CVS activity notification list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(73) |
Sep
(92) |
Oct
(9) |
Nov
(80) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(92) |
Feb
(52) |
Mar
(71) |
Apr
(64) |
May
(53) |
Jun
(10) |
Jul
(111) |
Aug
(93) |
Sep
(134) |
Oct
|
Nov
|
Dec
|
|
From: Marek P. <ma...@us...> - 2001-12-09 16:49:35
|
Update of /cvsroot/javaprofiler/library/demo In directory usw-pr-cvs1:/tmp/cvs-serv24402/demo Modified Files: Makefile.rules dir.info Log Message: socket communication fixes Index: Makefile.rules =================================================================== RCS file: /cvsroot/javaprofiler/library/demo/Makefile.rules,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile.rules 2001/12/03 16:26:25 1.4 --- Makefile.rules 2001/12/09 16:49:32 1.5 *************** *** 62,63 **** --- 62,80 ---- 04.clean.2: $(MAKE) $(MFLAGS) 04 clean + + 05.dir: + cd 05 + $(MAKE) $(MFLAGS) + cd .. + + 05.dir.2: + $(MAKE) $(MFLAGS) 05 + + 05.clean: + cd 05 + $(MAKE) $(MFLAGS) clean + cd .. + + 05.clean.2: + $(MAKE) $(MFLAGS) 05 clean + Index: dir.info =================================================================== RCS file: /cvsroot/javaprofiler/library/demo/dir.info,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** dir.info 2001/12/03 16:26:25 1.4 --- dir.info 2001/12/09 16:49:32 1.5 *************** *** 1 **** ! DIRS = 01 02 03 04 --- 1 ---- ! DIRS = 01 02 03 04 05 |
|
From: Marek P. <ma...@us...> - 2001-12-09 16:49:35
|
Update of /cvsroot/javaprofiler/library
In directory usw-pr-cvs1:/tmp/cvs-serv24402
Modified Files:
TODO
Log Message:
socket communication fixes
Index: TODO
===================================================================
RCS file: /cvsroot/javaprofiler/library/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TODO 2001/12/03 16:26:25 1.1
--- TODO 2001/12/09 16:49:32 1.2
***************
*** 3,8 ****
This _MUST_ really be done in near future:
- * check shared memory communication and fix it if needed
* try if switching sides of communication really works now
* port to Solaris
--- 3,8 ----
This _MUST_ really be done in near future:
* try if switching sides of communication really works now
+ * check shared memory communication and fix it if needed
* port to Solaris
|
|
From: Marek P. <ma...@us...> - 2001-12-09 16:47:17
|
Update of /cvsroot/javaprofiler/library/demo/05 In directory usw-pr-cvs1:/tmp/cvs-serv24052/demo/05 Log Message: Directory /cvsroot/javaprofiler/library/demo/05 added to the repository |
|
From: Pavel V. <va...@us...> - 2001-12-06 20:27:26
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv18604
Modified Files:
AllocClassData.java
Log Message:
use isArray atribute
Index: AllocClassData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocClassData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** AllocClassData.java 2001/12/01 17:42:54 1.6
--- AllocClassData.java 2001/12/06 20:27:22 1.7
***************
*** 70,74 ****
*/
AllocClassData( IProf.sID sid, ClassData clazz ) {
! this( sid.objId, clazz, 0 ); //sid.info...... ) ;
if (sid.alloc != null)
setStatistics(sid.alloc);
--- 70,74 ----
*/
AllocClassData( IProf.sID sid, ClassData clazz ) {
! this( sid.objId, clazz, ((IProf.sObjectInfo) sid.info).isArray );
if (sid.alloc != null)
setStatistics(sid.alloc);
***************
*** 156,159 ****
--- 156,162 ----
/*
* $Log$
+ * Revision 1.7 2001/12/06 20:27:22 vachis
+ * use isArray atribute
+ *
* Revision 1.6 2001/12/01 17:42:54 petrul
* changed constructor code
|
|
From: Pavel V. <va...@us...> - 2001-12-05 00:40:08
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv21191
Modified Files:
SnapshotImpl.java
Log Message:
fixies
Index: SnapshotImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/SnapshotImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SnapshotImpl.java 2001/12/04 00:14:51 1.3
--- SnapshotImpl.java 2001/12/05 00:40:05 1.4
***************
*** 445,450 ****
case IProf.OBJECT_TYPES: {
! //get class reference
! return new AllocClassData( sid, null );
}
--- 445,453 ----
case IProf.OBJECT_TYPES: {
! ClassData clz = (ClassData) libIDs.get( new Integer(
! ((IProf.sObjectInfo) sid.info).classObjId));
! return new AllocClassData( sid, clz );
! //have to look at sid.info.isArray, probably in object
! //before calling getClazz()
}
***************
*** 468,472 ****
ThreadData newObj = new ThreadData( sid, up, parent );
up.addThread( newObj );
! parent.addChild( newObj );
return newObj;
}
--- 471,476 ----
ThreadData newObj = new ThreadData( sid, up, parent );
up.addThread( newObj );
! if (parent != null )
! parent.addChild( newObj );
return newObj;
}
***************
*** 795,798 ****
--- 799,805 ----
/*
* $Log$
+ * Revision 1.4 2001/12/05 00:40:05 vachis
+ * fixies
+ *
* Revision 1.3 2001/12/04 00:14:51 vachis
* Changes to GetAllThruIterator()
|
|
From: Pavel V. <va...@us...> - 2001-12-05 00:39:31
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv20929
Modified Files:
ThreadData.java
Log Message:
MonMethods fix
Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ThreadData.java 2001/12/03 10:13:19 1.7
--- ThreadData.java 2001/12/05 00:39:26 1.8
***************
*** 80,84 ****
this.name=name;
this.group=group;
! this.parent=parent;
this.active=active;
children=new LinkedList();
--- 80,84 ----
this.name=name;
this.group=group;
! this.parent=parent; //warning probably may be null
this.active=active;
children=new LinkedList();
***************
*** 86,89 ****
--- 86,90 ----
allocMethods=new HashMap();
CPUMethods=new HashMap();
+ MonMethods=new HashMap();
}
***************
*** 286,289 ****
--- 287,293 ----
/*
* $Log$
+ * Revision 1.8 2001/12/05 00:39:26 vachis
+ * MonMethods fix
+ *
* Revision 1.7 2001/12/03 10:13:19 vachis
* addChild() fix
|
|
From: Pavel V. <va...@us...> - 2001-12-04 00:14:58
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv2572
Modified Files:
SnapshotImpl.java
Log Message:
Changes to GetAllThruIterator()
Index: SnapshotImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/SnapshotImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SnapshotImpl.java 2001/12/03 10:37:57 1.2
--- SnapshotImpl.java 2001/12/04 00:14:51 1.3
***************
*** 108,113 ****
extract( null, classes, IProf.CLASSES, IProf.NO_OPTIONAL_ARG, iprof );
//pending get class fields
! extract( classes, null, IProf.CLASS_FIELDS_STATICS, IProf.NO_OPTIONAL_ARG, iprof );
! extract( classes, null, IProf.CLASS_FIELDS_INSTANCES, IProf.NO_OPTIONAL_ARG, iprof );
//extract( classes, methods, IProf.CLASS_METHODS, IProf.NO_OPTIONAL_ARG, iprof );
extract( null, methods, IProf.METHODS, IProf.NO_OPTIONAL_ARG, iprof );
--- 108,113 ----
extract( null, classes, IProf.CLASSES, IProf.NO_OPTIONAL_ARG, iprof );
//pending get class fields
! // extract( classes, null, IProf.CLASS_FIELDS_STATICS, IProf.NO_OPTIONAL_ARG, iprof );
! // extract( classes, null, IProf.CLASS_FIELDS_INSTANCES, IProf.NO_OPTIONAL_ARG, iprof );
//extract( classes, methods, IProf.CLASS_METHODS, IProf.NO_OPTIONAL_ARG, iprof );
extract( null, methods, IProf.METHODS, IProf.NO_OPTIONAL_ARG, iprof );
***************
*** 361,368 ****
throws COMMUN_Exception { //throws
boolean pass = false;
! ListIterator iter, iterInner;
! IProf.sID sid;
! LinkedList listInner;
! IDObjectData obj, objInner, objOpposite;
if ( in == null ) {
--- 361,369 ----
throws COMMUN_Exception { //throws
boolean pass = false;
! ListIterator iter;
! Iterator iterInner;
! IProf.sID sid;
! LinkedList listInner;
! IDObjectData obj, objInner, objOpposite;
if ( in == null ) {
***************
*** 373,377 ****
iter = in.listIterator();
}
!
try {
//add hashtables for IDs (temporary)
--- 374,379 ----
iter = in.listIterator();
}
! //dbg
! int j=0;
try {
//add hashtables for IDs (temporary)
***************
*** 380,384 ****
//IProf.sInfo ci = (IProf.sClassInfo)iprof.getInfo( sid.infoId, IProf.CLASS_INFO);
if ( iter == null ) {
! listInner = iprof.getAll( 0, whatType,
IProf.isObjWithInfo( whatType), optArg );
pass = false;
--- 382,386 ----
//IProf.sInfo ci = (IProf.sClassInfo)iprof.getInfo( sid.infoId, IProf.CLASS_INFO);
if ( iter == null ) {
! iterInner = iprof.getAllThruIterator( 0, whatType, true,
IProf.isObjWithInfo( whatType), optArg );
pass = false;
***************
*** 387,398 ****
else{
obj = (IDObjectData) iter.next();
! listInner = iprof.getAll( obj.getID(), whatType,
! IProf.isObjWithInfo( whatType), optArg );
}
! //Prof.sInfo will be in IProf.sId
! //fill in the former calling, there will be special param
! iterInner = listInner.listIterator();
//dbg
int i=0;
try {
while( iterInner.hasNext() ) {
--- 389,399 ----
else{
obj = (IDObjectData) iter.next();
! iterInner = iprof.getAllThruIterator( obj.getID(), whatType,
! true, IProf.isObjWithInfo( whatType), optArg );
}
!
//dbg
int i=0;
+ j++;
try {
while( iterInner.hasNext() ) {
***************
*** 407,411 ****
}
//dbg
! }catch (Exception e) { System.out.print("zz");};
}
}
--- 408,416 ----
}
//dbg
! } catch (Exception e)
! { System.out.print("zz");};
!
! if ( iter == null ) //one pass
! break;
}
}
***************
*** 427,431 ****
}
catch ( Exception e ) {
! System.out.println( "Bad objID\n" );
}
--- 432,436 ----
}
catch ( Exception e ) {
! System.out.println( "Exception\n" );
}
***************
*** 784,787 ****
--- 789,793 ----
//TODO:
// write exception handling code properly
+ // write extraction of class fields
//write passing configuration
***************
*** 789,792 ****
--- 795,801 ----
/*
* $Log$
+ * Revision 1.3 2001/12/04 00:14:51 vachis
+ * Changes to GetAllThruIterator()
+ *
* Revision 1.2 2001/12/03 10:37:57 vachis
* chages to getAll() with info
|
|
From: Marek P. <ma...@us...> - 2001-12-03 16:26:29
|
Update of /cvsroot/javaprofiler/library/demo/04 In directory usw-pr-cvs1:/tmp/cvs-serv24727/demo/04 Added Files: Makefile Makefile.mak Makefile.rules README Test.java dir.info Log Message: demo to introduce new features of Java IProf class added, (net.sourceforge.javaprofiler.jpiimpl.commun.IProf) --- NEW FILE: Makefile --- include ../../config.mk include Makefile.rules --- NEW FILE: Makefile.mak --- !include ../../config.mk !include Makefile.rules --- NEW FILE: Makefile.rules --- Test.o \ Test.obj: $(JAVAC) $(JAVACFLAGS) Test.java --- NEW FILE: README --- This example shows how to use iterators (getAllThruIterator() and getChangedThruIterator() methods). It does the same as example 01 (very slow) and 02 (fast). Read comments in the file. --- NEW FILE: Test.java --- /* * Sun Public License Notice * * The contents of this file are subject to the Sun Public License * Version 1.0 (the "License"); you may not use this file except * in compliance with the License. A copy of the License is available * at http://www.sun.com/ * * The Original Code is the Java Profiler module. The Initial Developers * of the Original Code are Jan Stola, Pavel Vacha, Michal Pise, Petr Luner, * Lukas Petru and Marek Przeczek. * * Portions created by Jan Stola are Copyright (C) 2000-2001. * All Rights Reserved. * * Portions created by Pavel Vacha are Copyright (C) 2000-2001. * All Rights Reserved. * * Portions created by Michal Pise are Copyright (C) 2000-2001. * All Rights Reserved. * * Portions created by Petr Luner are Copyright (C) 2000-2001. * All Rights Reserved. * * Portions created by Lukas Petru are Copyright (C) 2000-2001. * All Rights Reserved. * * Portions created by Marek Przeczek are Copyright (C) 2000-2001. * All Rights Reserved. * * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner, * Lukas Petru and Marek Przeczek. */ import java.lang.*; import java.util.*; import net.sourceforge.javaprofiler.jpiimpl.commun.*; public class Test { // communication interface private IProf iprof = null; private int askForMethods( int objId) throws Exception { int numMethods = 0; // ask for all methods of given class Iterator iterator = iprof.getAllThruIterator( objId, IProf.CLASS_METHODS, true, true, IProf.NO_OPTIONAL_ARG); while( iterator.hasNext()) { // take the first one directly from I/O buffer IProf.sID sid = (IProf.sID)iterator.next(); // write method name IProf.sMethodInfo mi = (IProf.sMethodInfo)sid.info; System.out.println( " METHOD: " + mi.methodName); numMethods++; } System.out.println(); return numMethods; } private void askForClasses() throws Exception { int numClasses = 0; int numMethods = 0; // ask for all classes Iterator iterator = iprof.getAllThruIterator( 0, IProf.CLASSES, true, true, IProf.NO_OPTIONAL_ARG); while( iterator.hasNext()) { // take the first one directly from I/O buffer // every time returned, sid references to same object // only data inside it are changed // WHY: because 'sameOutputObject' of getAllThruIterator() // was set to 'true' => we don't waste our memory IProf.sID sid = (IProf.sID)iterator.next(); // write class name IProf.sClassInfo ci = (IProf.sClassInfo)sid.info; System.out.println( "CLASS: " + ci.className); // ask for all methods of choosen class numMethods += askForMethods( sid.objId); numClasses++; } System.out.println( "NUMBER OF CLASSES: " + numClasses); // following two numbers should be the same // if not, something is bad LinkedList list = iprof.getAll( 0, IProf.METHODS); System.out.println( "NUMBER OF METHODS (1): " + numMethods); System.out.println( "NUMBER OF METHODS (2): " + list.size()); } public void runTest() { // initialize and start communication // sockets are used by default iprof = new IProf(); iprof.run(); try { // til profiled program is going, do nothing while( !iprof.isShutdowned()) { System.out.println( "waiting..."); Thread.sleep( 1000); } // profiled program has finished, so ask for all classes askForClasses(); // now, i don't want anything else, // so I shutdown profiled JVM definitely iprof.shutdown(); } catch( Exception e) { System.err.println( "an error occurred, exception:"); System.err.println( e.getClass().getName()); } // communication must be stopped even if an error occurred ! iprof.stop(); iprof = null; } public static void main( String[] arg) { // let's run the test (new Test()).runTest(); } }; --- NEW FILE: dir.info --- FILES = Test CLEAN_FILES = *.class |
|
From: Marek P. <ma...@us...> - 2001-12-03 16:26:28
|
Update of /cvsroot/javaprofiler/library/demo/02 In directory usw-pr-cvs1:/tmp/cvs-serv24727/demo/02 Modified Files: Test.java Log Message: demo to introduce new features of Java IProf class added, (net.sourceforge.javaprofiler.jpiimpl.commun.IProf) Index: Test.java =================================================================== RCS file: /cvsroot/javaprofiler/library/demo/02/Test.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Test.java 2001/11/21 22:31:52 1.1 --- Test.java 2001/12/03 16:26:25 1.2 *************** *** 49,53 **** // ask for all methods of given class ! LinkedList listMethods = iprof.getAll( objId, IProf.CLASS_METHODS, true, 0); ListIterator iterator = listMethods.listIterator(); --- 49,55 ---- // ask for all methods of given class ! LinkedList listMethods = iprof.getAll( objId, IProf.CLASS_METHODS, ! true, IProf.NO_OPTIONAL_ARG); ! ListIterator iterator = listMethods.listIterator(); *************** *** 70,74 **** // ask for all classes ! LinkedList listClasses = iprof.getAll( 0, IProf.CLASSES, true, 0); ListIterator iterator = listClasses.listIterator(); --- 72,78 ---- // ask for all classes ! LinkedList listClasses = iprof.getAll( 0, IProf.CLASSES, ! true, IProf.NO_OPTIONAL_ARG); ! ListIterator iterator = listClasses.listIterator(); |
|
From: Marek P. <ma...@us...> - 2001-12-03 16:26:28
|
Update of /cvsroot/javaprofiler/library/demo In directory usw-pr-cvs1:/tmp/cvs-serv24727/demo Modified Files: Makefile.rules dir.info Log Message: demo to introduce new features of Java IProf class added, (net.sourceforge.javaprofiler.jpiimpl.commun.IProf) Index: Makefile.rules =================================================================== RCS file: /cvsroot/javaprofiler/library/demo/Makefile.rules,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.rules 2001/11/28 23:34:52 1.3 --- Makefile.rules 2001/12/03 16:26:25 1.4 *************** *** 47,48 **** --- 47,63 ---- $(MAKE) $(MFLAGS) 03 clean + 04.dir: + cd 04 + $(MAKE) $(MFLAGS) + cd .. + + 04.dir.2: + $(MAKE) $(MFLAGS) 04 + + 04.clean: + cd 04 + $(MAKE) $(MFLAGS) clean + cd .. + + 04.clean.2: + $(MAKE) $(MFLAGS) 04 clean Index: dir.info =================================================================== RCS file: /cvsroot/javaprofiler/library/demo/dir.info,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** dir.info 2001/11/28 23:34:52 1.3 --- dir.info 2001/12/03 16:26:25 1.4 *************** *** 1 **** ! DIRS = 01 02 03 --- 1 ---- ! DIRS = 01 02 03 04 |
|
From: Marek P. <ma...@us...> - 2001-12-03 16:26:28
|
Update of /cvsroot/javaprofiler/library In directory usw-pr-cvs1:/tmp/cvs-serv24727 Added Files: TODO Log Message: demo to introduce new features of Java IProf class added, (net.sourceforge.javaprofiler.jpiimpl.commun.IProf) --- NEW FILE: TODO --- 2001-12-03 This _MUST_ really be done in near future: * check shared memory communication and fix it if needed * try if switching sides of communication really works now * port to Solaris New features will be implemented later: * CallTree - both for sampling and exact methods of CPU profiling |
|
From: Marek P. <ma...@us...> - 2001-12-03 16:24:15
|
Update of /cvsroot/javaprofiler/library/demo/04 In directory usw-pr-cvs1:/tmp/cvs-serv24106/demo/04 Log Message: Directory /cvsroot/javaprofiler/library/demo/04 added to the repository |
|
From: Marek P. <ma...@us...> - 2001-12-03 15:49:59
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun
In directory usw-pr-cvs1:/tmp/cvs-serv12226/net/sourceforge/javaprofiler/jpiimpl/commun
Modified Files:
IProf.java IProfException.java
Log Message:
new features of IProf class added
Index: IProf.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun/IProf.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** IProf.java 2001/12/03 10:02:23 1.7
--- IProf.java 2001/12/03 15:49:56 1.8
***************
*** 36,39 ****
--- 36,40 ----
import java.util.*;
+ import java.lang.*;
/** Communication interface class. This class implements
***************
*** 824,832 ****
** of #sInfo structure. Reference to new #sInfo object
** is returned. Offset 'o' is changed to position behind
! ** just parsed item.
**
** @param infoType type of information stored in buffer
** @param b buffer
** @param o position in the buffer (input/output)
**
** @return information about object
--- 825,836 ----
** of #sInfo structure. Reference to new #sInfo object
** is returned. Offset 'o' is changed to position behind
! ** just parsed item. If 'info' is not null, it is used
! ** as output #sInfo structure (and a reference to it
! ** is returned).
**
** @param infoType type of information stored in buffer
** @param b buffer
** @param o position in the buffer (input/output)
+ ** @param info output buffer (if null, new instance is created)
**
** @return information about object
***************
*** 834,838 ****
** @see sInfo, getInfo() */
! private sInfo getInfo( int infoType, Buffer b, sOffset o) {
switch( infoType) {
--- 838,842 ----
** @see sInfo, getInfo() */
! private sInfo getInfo( int infoType, Buffer b, sOffset o, sInfo info) {
switch( infoType) {
***************
*** 840,845 ****
case CLASS_INFO: {
! sClassInfo info = new sClassInfo();
! o.offset = getClassInfo( b, o.offset, info);
return info;
--- 844,849 ----
case CLASS_INFO: {
! if( info == null) info = new sClassInfo();
! o.offset = getClassInfo( b, o.offset, (sClassInfo)info);
return info;
***************
*** 848,853 ****
case CLASS_FIELD_INFO: {
! sClassFieldInfo info = new sClassFieldInfo();
! o.offset = getClassFieldInfo( b, o.offset, info);
return info;
--- 852,857 ----
case CLASS_FIELD_INFO: {
! if( info == null) info = new sClassFieldInfo();
! o.offset = getClassFieldInfo( b, o.offset, (sClassFieldInfo)info);
return info;
***************
*** 856,861 ****
case METHOD_INFO: {
! sMethodInfo info = new sMethodInfo();
! o.offset = getMethodInfo( b, o.offset, info);
return info;
--- 860,865 ----
case METHOD_INFO: {
! if( info == null) info = new sMethodInfo();
! o.offset = getMethodInfo( b, o.offset, (sMethodInfo)info);
return info;
***************
*** 864,870 ****
case TRACE_INFO: {
! sTraceInfo info = new sTraceInfo();
! o.offset = getTraceInfo( b, o.offset, info);
!
return info;
}
--- 868,874 ----
case TRACE_INFO: {
! if( info == null) info = new sTraceInfo();
! o.offset = getTraceInfo( b, o.offset, (sTraceInfo)info);
!
return info;
}
***************
*** 872,877 ****
case OBJECT_INFO: {
! sObjectInfo info = new sObjectInfo();
! o.offset = getObjectInfo( b, o.offset, info);
return info;
--- 876,881 ----
case OBJECT_INFO: {
! if( info == null) info = new sObjectInfo();
! o.offset = getObjectInfo( b, o.offset, (sObjectInfo)info);
return info;
***************
*** 880,885 ****
case ARENA_INFO: {
! sArenaInfo info = new sArenaInfo();
! o.offset = getArenaInfo( b, o.offset, info);
return info;
--- 884,889 ----
case ARENA_INFO: {
! if( info == null) info = new sArenaInfo();
! o.offset = getArenaInfo( b, o.offset, (sArenaInfo)info);
return info;
***************
*** 888,893 ****
case THREAD_INFO: {
! sThreadInfo info = new sThreadInfo();
! o.offset = getThreadInfo( b, o.offset, info);
return info;
--- 892,897 ----
case THREAD_INFO: {
! if( info == null) info = new sThreadInfo();
! o.offset = getThreadInfo( b, o.offset, (sThreadInfo)info);
return info;
***************
*** 896,901 ****
case THREAD_GROUP_INFO: {
! sThreadGroupInfo info = new sThreadGroupInfo();
! o.offset = getThreadGroupInfo( b, o.offset, info);
return info;
--- 900,905 ----
case THREAD_GROUP_INFO: {
! if( info == null) info = new sThreadGroupInfo();
! o.offset = getThreadGroupInfo( b, o.offset, (sThreadGroupInfo)info);
return info;
***************
*** 904,909 ****
case GC_INFO: {
! sGCInfo info = new sGCInfo();
! o.offset = getGCInfo( b, o.offset, info);
return info;
--- 908,913 ----
case GC_INFO: {
! if( info == null) info = new sGCInfo();
! o.offset = getGCInfo( b, o.offset, (sGCInfo)info);
return info;
***************
*** 960,964 ****
}
! return getInfo( infoType, _buf, new sOffset( pos));
}
--- 964,968 ----
}
! return getInfo( infoType, _buf, new sOffset( pos), null);
}
***************
*** 1393,1526 ****
public static final int NO_OPTIONAL_ARG = 0;
! /** Internal implementation of getAll() and getChanged(). This
! ** method is a general implementation of getAll() and getChanged()
! ** methods which generally do the same thing.
! **
! ** @param funcType type of method called
! ** @param objId identifier of object having a data
! ** @param seqType specified action
! ** @param includeInfo include information about object
! ** @param optionalArg optional argument (depends on type of object)
! **
! ** @return linked list of sID objects
! **
! ** @see getAll(), getChanged() */
!
! private LinkedList getChangedOrAll( int funcType,
! int objId,
! int seqType,
! boolean includeInfo,
! int optionalArg)
!
! throws COMMUN_Exception,
! BAD_OBJ_ID_Exception,
! BAD_COMMAND_Exception,
! UNKNOWN_Exception {
! _buf.clear();
! _buf.putInt( funcType);
! _buf.putInt( objId);
! _buf.putInt( seqType);
! if( includeInfo) _buf.putInt( 1);
! else _buf.putInt( 0);
!
! _buf.putInt( optionalArg);
! _commun.write( _buf);
! if( _commun.hasFailed()) throw new COMMUN_Exception();
!
! _commun.read( _buf);
! if( _commun.hasFailed()) throw new COMMUN_Exception();
!
! int pos = 0;
! int len = _buf.getInt( pos);
!
! pos += 4;
!
! if( len < 0) {
! if( len == RC_BAD_OBJ_ID) throw new BAD_OBJ_ID_Exception();
! if( len == RC_BAD_COMMAND) throw new BAD_COMMAND_Exception();
! throw new UNKNOWN_Exception();
}
! LinkedList list = new LinkedList();
! for( int i = 0; i < len; i++) {
! sID stat = new sID();
! stat.infoId = _buf.getInt( pos);
! pos += 4;
! stat.objId = _buf.getInt( pos);
! pos += 4;
! stat.parentLeftObjId = _buf.getInt( pos);
! pos += 4;
! stat.parentUpObjId = _buf.getInt( pos);
! pos += 4;
! stat.parentRightObjId = _buf.getInt( pos);
! pos += 4;
! stat.active = ( _buf.getInt( pos) != 0);
! pos += 4;
! int hasData = _buf.getInt( pos);
! pos += 4;
if( hasData != 0) {
! stat.alloc = new sAllocStatData();
! pos = getAllocStatData( _buf, pos, stat.alloc);
}
! else stat.alloc = null;
! hasData = _buf.getInt( pos);
! pos += 4;
if( hasData != 0) {
! stat.cpu = new sCpuStatData();
! pos = getCpuStatData( _buf, pos, stat.cpu);
}
! else stat.cpu = null;
! hasData = _buf.getInt( pos);
! pos += 4;
if( hasData != 0) {
! stat.mon = new sMonStatData();
! pos = getMonStatData( _buf, pos, stat.mon);
}
! else stat.mon = null;
! boolean hasInfo = ( _buf.getInt( pos) != 0);
! pos += 4;
if( hasInfo) {
! stat.infoType = _buf.getInt( pos);
! pos += 4;
! sOffset o = new sOffset( pos);
! stat.info = getInfo( stat.infoType, _buf, o);
! pos = o.offset;
}
else {
! stat.infoType = 0;
! stat.info = null;
}
! list.addLast( stat);
}
--- 1397,1661 ----
public static final int NO_OPTIONAL_ARG = 0;
! /** Iterator thru statistic data. This class implements
! ** an iterator which can be used to iterate thru
! ** profiling statistic data returned by the dynamic
! ** profiling library. It implements a standard Iterator
! ** interface. An instance of this class is internally
! ** used by getAllThruIterator() and getChangedThruIterator()
! ** methods. remove() method of the interface is not
! ** implemented.
! **
! ** @see Iterator */
!
! private class StatDataIterator implements Iterator {
!
! /// reference to existing binary data buffer
! private Buffer _dataBuf = null;
!
! /** Use still the same object as next() returned value.
! ** It means the same object (of sID class) is used for
! ** storing all statistic data each time next() method
! ** is called. An advantage: only one instance of sID class
! ** exists during whole iteration. A disadvantage: next call
! ** to next() method will overwrite old values, so it is
! ** necessary to copy values stored inside the object somewhere
! ** else (eg. to custom data class etc.). */
!
! private boolean _sameObject;
!
! /// output structure filled by statistic data
! private sID _stat = null;
! /// current position in the buffer
! private int _pos;
! /// number of items which remain in the buffer yet
! private int _numItems;
! /** Constructor. It initializes internal member variables.
! **
! ** @param buf reference to existing binary data buffer
! ** @param sameObject use the same output object every time
! **
! ** @see _sameObject */
! public StatDataIterator( Buffer buf, boolean sameObject) {
! _dataBuf = buf;
! _sameObject = sameObject;
!
! _pos = 4;
! _numItems = _dataBuf.getInt( 0);
}
! /** Next element in the iteration. This method returns
! ** next element in the iteration. First time it returns
! ** first element. NoSuchElementException is thrown when
! ** iteration has no more elements.
! **
! ** @return next element in the iteration */
! public Object next() throws NoSuchElementException {
! if( _numItems <= 0) throw new NoSuchElementException();
!
! _numItems--;
!
! if( !_sameObject || _stat == null) _stat = new sID();
! _stat.infoId = _dataBuf.getInt( _pos);
! _pos += 4;
! _stat.objId = _dataBuf.getInt( _pos);
! _pos += 4;
! _stat.parentLeftObjId = _dataBuf.getInt( _pos);
! _pos += 4;
! _stat.parentUpObjId = _dataBuf.getInt( _pos);
! _pos += 4;
! _stat.parentRightObjId = _dataBuf.getInt( _pos);
! _pos += 4;
! _stat.active = ( _dataBuf.getInt( _pos) != 0);
! _pos += 4;
! int hasData = _dataBuf.getInt( _pos);
! _pos += 4;
if( hasData != 0) {
! if( _stat.alloc == null) _stat.alloc = new sAllocStatData();
! _pos = getAllocStatData( _dataBuf, _pos, _stat.alloc);
}
! else _stat.alloc = null;
! hasData = _dataBuf.getInt( _pos);
! _pos += 4;
if( hasData != 0) {
! if( _stat.cpu == null) _stat.cpu = new sCpuStatData();
! _pos = getCpuStatData( _dataBuf, _pos, _stat.cpu);
}
! else _stat.cpu = null;
! hasData = _dataBuf.getInt( _pos);
! _pos += 4;
if( hasData != 0) {
! if( _stat.mon == null) _stat.mon = new sMonStatData();
! _pos = getMonStatData( _dataBuf, _pos, _stat.mon);
}
! else _stat.mon = null;
! boolean hasInfo = ( _dataBuf.getInt( _pos) != 0);
! _pos += 4;
if( hasInfo) {
! _stat.infoType = _dataBuf.getInt( _pos);
! _pos += 4;
! sOffset o = new sOffset( _pos);
! _stat.info = getInfo( _stat.infoType, _dataBuf, o, _stat.info);
! _pos = o.offset;
}
else {
! _stat.infoType = 0;
! _stat.info = null;
}
+
+ return _stat;
+ }
+
+ /** Does next item exist in the iteration ? This method returns
+ ** true if the iteration has more elements. In other words
+ ** it returns true if next() would return an element rather
+ ** than throwing an exception.
+ **
+ ** @return true (iterator has more elements);
+ ** false (no other element) */
+
+ public boolean hasNext() {
! return ( _numItems != 0);
! }
!
! /** Remove an element from iteration. This method is not
! ** implemented so it throws an UnsupportedOperationException
! ** every time. */
!
! public void remove() throws UnsupportedOperationException {
!
! throw new UnsupportedOperationException();
! }
! };
!
! /** Internal implementation of getAllThruIterator() and
! ** getChangedThruIterator(). This method is a general
! ** implementation of getAllThruIterator() and
! ** getChangedThruIterator() methods which generally do
! ** the same thing. 'sameOutputObject' argument specifies
! ** if an iterator should use still the same output object
! ** filled by statistic data for iterator.next() call.
! ** More about it in #StatDataIterator class.
! **
! ** @param funcType type of method called
! ** @param objId identifier of object having a data
! ** @param seqType specified action
! ** @param sameOutputObject use still same output object for iterator.next()
! ** @param includeInfo include information about object
! ** @param optionalArg optional argument (depends on type of object)
! **
! ** @return iterator for objects having statistic data
! **
! ** @see getAllThruIterator(), getChangedThruIterator(),
! ** StatDataIterator, getChangedOrAll() */
!
! private Iterator getChangedOrAllThruIterator( int funcType,
! int objId,
! int seqType,
! boolean sameOutputObject,
! boolean includeInfo,
! int optionalArg)
!
! throws COMMUN_Exception,
! BAD_OBJ_ID_Exception,
! BAD_COMMAND_Exception,
! UNKNOWN_Exception {
!
! _buf.clear();
! _buf.putInt( funcType);
! _buf.putInt( objId);
! _buf.putInt( seqType);
!
! if( includeInfo) _buf.putInt( 1);
! else _buf.putInt( 0);
!
! _buf.putInt( optionalArg);
!
! _commun.write( _buf);
! if( _commun.hasFailed()) throw new COMMUN_Exception();
!
! _commun.read( _buf);
! if( _commun.hasFailed()) throw new COMMUN_Exception();
!
! int rc = _buf.getInt( 0);
!
! if( rc < 0) {
!
! if( rc == RC_BAD_OBJ_ID) throw new BAD_OBJ_ID_Exception();
! if( rc == RC_BAD_COMMAND) throw new BAD_COMMAND_Exception();
!
! throw new UNKNOWN_Exception();
! }
!
! Iterator iterator = new StatDataIterator( _buf, sameOutputObject);
! _buf = new Buffer();
!
! return iterator;
! }
!
! /** Internal implementation of getAll() and getChanged(). This
! ** method is a general implementation of getAll() and getChanged()
! ** methods which generally do the same thing.
! **
! ** @param funcType type of method called
! ** @param objId identifier of object having a data
! ** @param seqType specified action
! ** @param includeInfo include information about object
! ** @param optionalArg optional argument (depends on type of object)
! **
! ** @return linked list of sID objects
! **
! ** @see getAll(), getChanged(), getChangedOrAllThruIterator() */
!
! private LinkedList getChangedOrAll( int funcType,
! int objId,
! int seqType,
! boolean includeInfo,
! int optionalArg)
!
! throws COMMUN_Exception,
! BAD_OBJ_ID_Exception,
! BAD_COMMAND_Exception,
! UNKNOWN_Exception {
!
! Iterator iterator = getChangedOrAllThruIterator(
! funcType, objId, seqType, false,
! includeInfo, optionalArg);
!
! LinkedList list = new LinkedList();
!
! while( iterator.hasNext()) {
!
! list.addLast( iterator.next());
}
***************
*** 1537,1548 ****
** #CLASS_FIELDS_STATICS, #CLASS_FIELDS_INSTANCES, #CLASS_METHODS,
** #ALLOC_METHOD_TRACES, #ALLOC_METHOD_OBJECTS, #ALLOC_METHOD_THREADS,
! ** #ALLOC_TRACE_OBJECTS, #ALLOC_TRACE_THREADS, #ALLOC_OBJECT_METHODS,
! ** #ALLOC_OBJECT_METHOD_TRACES, #ALLOC_OBJECT_THREADS,
! ** #ALLOC_OBJECT_METHOD_THREADS, #ALLOC_OBJECT_METHOD_TRACE_THREADS,
! ** #ALLOC_THREAD_OBJECTS, #ALLOC_THREAD_OBJECT_METHODS,
! ** #ALLOC_THREAD_OBJECT_METHOD_TRACES, #ALLOC_THREAD_METHODS,
! ** #ALLOC_THREAD_METHOD_TRACES, #ALLOC_THREAD_METHOD_OBJECTS,
! ** #ALLOC_THREAD_METHOD_TRACE_OBJECTS, #CPU_METHOD_TRACES,
! ** #CPU_METHOD_THREADS, #CPU_METHOD_TRACE_THREADS,
** #CPU_THREAD_METHODS, #CPU_THREAD_METHOD_TRACES,
** #MON_METHOD_TRACES, #MON_METHOD_THREADS,
--- 1672,1683 ----
** #CLASS_FIELDS_STATICS, #CLASS_FIELDS_INSTANCES, #CLASS_METHODS,
** #ALLOC_METHOD_TRACES, #ALLOC_METHOD_OBJECTS, #ALLOC_METHOD_THREADS,
! ** #ALLOC_TRACE_OBJECTS, #ALLOC_METHOD_TRACE_THREADS,
! ** #ALLOC_OBJECT_METHODS, #ALLOC_OBJECT_METHOD_TRACES,
! ** #ALLOC_OBJECT_THREADS, #ALLOC_OBJECT_METHOD_THREADS,
! ** #ALLOC_OBJECT_METHOD_TRACE_THREADS, #ALLOC_THREAD_OBJECTS,
! ** #ALLOC_THREAD_OBJECT_METHODS, #ALLOC_THREAD_OBJECT_METHOD_TRACES,
! ** #ALLOC_THREAD_METHODS, #ALLOC_THREAD_METHOD_TRACES,
! ** #ALLOC_THREAD_METHOD_OBJECTS, #ALLOC_THREAD_METHOD_TRACE_OBJECTS,
! ** #CPU_METHOD_TRACES, #CPU_METHOD_THREADS, #CPU_METHOD_TRACE_THREADS,
** #CPU_THREAD_METHODS, #CPU_THREAD_METHOD_TRACES,
** #MON_METHOD_TRACES, #MON_METHOD_THREADS,
***************
*** 1561,1565 ****
** @return linked list of sID objects
**
! ** @see getInfo(), getData(), getChanged() */
public synchronized LinkedList getAll( int objId,
--- 1696,1702 ----
** @return linked list of sID objects
**
! ** @see getInfo(), getData(), getAll(), getChanged(),
! ** getAllThruIterator(), getChangedThruIterator(),
! ** getChangedOrAll() */
public synchronized LinkedList getAll( int objId,
***************
*** 1579,1583 ****
/** Get all objects with all statistic data.
**
! ** @see getAll(), getChanged(), getChangedOrAll() */
public synchronized LinkedList getAll( int objId, int seqType)
--- 1716,1721 ----
/** Get all objects with all statistic data.
**
! ** @see getAll(), getChanged(), getChangedOrAll(),
! ** getAllThruIterator(), getChangedThruIterator() */
public synchronized LinkedList getAll( int objId, int seqType)
***************
*** 1587,1592 ****
BAD_COMMAND_Exception,
UNKNOWN_Exception {
! return getChangedOrAll( F_GET_ALL, objId, seqType, false, NO_OPTIONAL_ARG);
}
--- 1725,1773 ----
BAD_COMMAND_Exception,
UNKNOWN_Exception {
+
+ return getChangedOrAll( F_GET_ALL, objId, seqType,
+ false, NO_OPTIONAL_ARG);
+ }
+
+ /** Get all objects with all statistic data.
+ **
+ ** @see getAllThruIterator(), getChangedThruIterator(),
+ ** getChangedOrAllThruIterator(), getAll(), getChanged() */
+
+ public synchronized
+ Iterator getAllThruIterator( int objId,
+ int seqType,
+ boolean sameOutputObject,
+ boolean includeInfo,
+ int optionalArg)
+
+ throws COMMUN_Exception,
+ BAD_OBJ_ID_Exception,
+ BAD_COMMAND_Exception,
+ UNKNOWN_Exception {
+
+ return getChangedOrAllThruIterator( F_GET_ALL, objId, seqType,
+ sameOutputObject, includeInfo,
+ optionalArg);
+ }
+
+ /** Get all objects with all statistic data.
+ **
+ ** @see getAllThruIterator(), getChangedThruIterator(),
+ ** getChangedOrAllThruIterator(), getAll(), getChanged() */
+
+ public synchronized
+ Iterator getAllThruIterator( int objId,
+ int seqType,
+ boolean sameOutputObject)
! throws COMMUN_Exception,
! BAD_OBJ_ID_Exception,
! BAD_COMMAND_Exception,
! UNKNOWN_Exception {
!
! return getChangedOrAllThruIterator( F_GET_ALL, objId, seqType,
! sameOutputObject, false,
! NO_OPTIONAL_ARG);
}
***************
*** 1601,1612 ****
** #CLASS_FIELDS_STATICS, #CLASS_FIELDS_INSTANCES, #CLASS_METHODS,
** #ALLOC_METHOD_TRACES, #ALLOC_METHOD_OBJECTS, #ALLOC_METHOD_THREADS,
! ** #ALLOC_TRACE_OBJECTS, #ALLOC_TRACE_THREADS, #ALLOC_OBJECT_METHODS,
! ** #ALLOC_OBJECT_METHOD_TRACES, #ALLOC_OBJECT_THREADS,
! ** #ALLOC_OBJECT_METHOD_THREADS, #ALLOC_OBJECT_METHOD_TRACE_THREADS,
! ** #ALLOC_THREAD_OBJECTS, #ALLOC_THREAD_OBJECT_METHODS,
! ** #ALLOC_THREAD_OBJECT_METHOD_TRACES, #ALLOC_THREAD_METHODS,
! ** #ALLOC_THREAD_METHOD_TRACES, #ALLOC_THREAD_METHOD_OBJECTS,
! ** #ALLOC_THREAD_METHOD_TRACE_OBJECTS, #CPU_METHOD_TRACES,
! ** #CPU_METHOD_THREADS, #CPU_METHOD_TRACE_THREADS,
** #CPU_THREAD_METHODS, #CPU_THREAD_METHOD_TRACES,
** #MON_METHOD_TRACES, #MON_METHOD_THREADS,
--- 1782,1793 ----
** #CLASS_FIELDS_STATICS, #CLASS_FIELDS_INSTANCES, #CLASS_METHODS,
** #ALLOC_METHOD_TRACES, #ALLOC_METHOD_OBJECTS, #ALLOC_METHOD_THREADS,
! ** #ALLOC_TRACE_OBJECTS, #ALLOC_METHOD_TRACE_THREADS,
! ** #ALLOC_OBJECT_METHODS, #ALLOC_OBJECT_METHOD_TRACES,
! ** #ALLOC_OBJECT_THREADS, #ALLOC_OBJECT_METHOD_THREADS,
! ** #ALLOC_OBJECT_METHOD_TRACE_THREADS, #ALLOC_THREAD_OBJECTS,
! ** #ALLOC_THREAD_OBJECT_METHODS, #ALLOC_THREAD_OBJECT_METHOD_TRACES,
! ** #ALLOC_THREAD_METHODS, #ALLOC_THREAD_METHOD_TRACES,
! ** #ALLOC_THREAD_METHOD_OBJECTS, #ALLOC_THREAD_METHOD_TRACE_OBJECTS,
! ** #CPU_METHOD_TRACES, #CPU_METHOD_THREADS, #CPU_METHOD_TRACE_THREADS,
** #CPU_THREAD_METHODS, #CPU_THREAD_METHOD_TRACES,
** #MON_METHOD_TRACES, #MON_METHOD_THREADS,
***************
*** 1619,1623 ****
** @return linked list of sID objects
**
! ** @see getInfo(), getData(), getAll() */
public synchronized LinkedList getChanged( int objId,
--- 1800,1806 ----
** @return linked list of sID objects
**
! ** @see getInfo(), getData(), getAll(), getChanged(),
! ** getAllThruIterator(), getChangedThruIterator(),
! ** getChangedOrAll() */
public synchronized LinkedList getChanged( int objId,
***************
*** 1637,1641 ****
/** Get all objects with changed statistic data.
**
! ** @see getChanged(), getAll(), getChangedOrAll() */
public synchronized LinkedList getChanged( int objId, int seqType)
--- 1820,1825 ----
/** Get all objects with changed statistic data.
**
! ** @see getChanged(), getAll(), getChangedOrAll(),
! ** getChangedThruIterator(), getAllThruIterator() */
public synchronized LinkedList getChanged( int objId, int seqType)
***************
*** 1645,1650 ****
BAD_COMMAND_Exception,
UNKNOWN_Exception {
! return getChangedOrAll( F_GET_CHANGED, objId, seqType, false, NO_OPTIONAL_ARG);
}
--- 1829,1877 ----
BAD_COMMAND_Exception,
UNKNOWN_Exception {
+
+ return getChangedOrAll( F_GET_CHANGED, objId, seqType,
+ false, NO_OPTIONAL_ARG);
+ }
+
+ /** Get all objects with changed statistic data.
+ **
+ ** @see getChangedThruIterator(), getAllThruIterator(),
+ ** getChangedOrAllThruIterator(), getChanged(), getAll() */
+
+ public synchronized
+ Iterator getChangedThruIterator( int objId,
+ int seqType,
+ boolean sameOutputObject,
+ boolean includeInfo,
+ int optionalArg)
+
+ throws COMMUN_Exception,
+ BAD_OBJ_ID_Exception,
+ BAD_COMMAND_Exception,
+ UNKNOWN_Exception {
+
+ return getChangedOrAllThruIterator( F_GET_CHANGED, objId, seqType,
+ sameOutputObject, includeInfo,
+ optionalArg);
+ }
+
+ /** Get all objects with changed statistic data.
+ **
+ ** @see getChangedThruIterator(), getAllThruIterator(),
+ ** getChangedOrAllThruIterator(), getChanged(), getAll() */
+
+ public synchronized
+ Iterator getChangedThruIterator( int objId,
+ int seqType,
+ boolean sameOutputObject)
! throws COMMUN_Exception,
! BAD_OBJ_ID_Exception,
! BAD_COMMAND_Exception,
! UNKNOWN_Exception {
!
! return getChangedOrAllThruIterator( F_GET_CHANGED, objId, seqType,
! sameOutputObject, false,
! NO_OPTIONAL_ARG);
}
***************
*** 1738,1776 ****
}
}
!
! /** Returns true if operation extracts objets, which have their own info.
! **(I can call getInfo or getAll with 'includeInfo' argument for them)
! **
! ** @param opType type of operation for getAll()/getChanged() methods
! **
! ** @return true if operation extracts objets, which have their own info.
! **
! ** @see getChanged(), getData(), getAll(), getInfo()
! **/
! public static boolean isObjWithInfo( int opType ) {
! switch( opType) {
!
! case CLASSES:
! case METHODS:
! case CLASS_METHODS:
! case CPU_METHOD_TRACES:
! case ALLOC_METHOD_TRACES:
! case MON_METHOD_TRACES:
! case CPU_TRACES:
! case ALLOC_TRACES:
! case MON_TRACES:
! case OBJECT_TYPES:
! case GROUPS_OF_THREADS:
! case GROUP_THREADS:
! case THREADS:
! //??
! case CLASS_FIELDS_STATICS:
! case CLASS_FIELDS_INSTANCES:
!
! return true;
!
! default:
! return false;
! }
! }
};
--- 1965,2027 ----
}
}
!
! /** Returns true if operation extracts objects which have their own info.
! ** (so getInfo() or getAll()/getChanged() methods with 'includeInfo' argument
! ** set to 'true' can be called for them).
! **
! ** @param opType type of operation for getAll()/getChanged() methods
! **
! ** @return true (operation extracts objects which have their own info);
! ** false
! **
! ** @see getChanged(), getAll(), getInfo(),
! ** getChangedThruIterator(), getAllThruIterator() */
!
! public static boolean isObjWithInfo( int opType) {
!
! switch( opType) {
!
! // info in sClassInfo
! case CLASSES:
!
! // info in sClassFieldInfo
! case CLASS_FIELDS_STATICS:
! case CLASS_FIELDS_INSTANCES:
!
! // info in sMethodInfo
! case CLASS_METHODS:
! case METHODS:
!
! // info in sTraceInfo
! case ALLOC_METHOD_TRACES:
! case CPU_METHOD_TRACES:
! case MON_METHOD_TRACES:
!
! case ALLOC_TRACES:
! case CPU_TRACES:
! case MON_TRACES:
!
! // info in sObjectInfo
! case OBJECT_TYPES:
!
! // info in sThreadGroupInfo
! case GROUPS_OF_THREADS:
!
! // info in sThreadInfo
! case GROUP_THREADS:
! case THREADS:
!
! // info in sArenaInfo
! case ARENAS:
!
! // info in sGCInfo
! case GCS:
!
! return true;
!
! default:
!
! return false;
! }
! }
};
Index: IProfException.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun/IProfException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IProfException.java 2001/11/21 22:05:55 1.2
--- IProfException.java 2001/12/03 15:49:56 1.3
***************
*** 41,45 ****
** @see BAD_COMMAND_Exception, BAD_DATA_TYPE_Exception,
** BAD_INFO_ID_Exception, BAD_INFO_TYPE_Exception,
! ** BAD_OBJ_ID_Exception, COMMUN_Exception, UNKNOWN_Exception
**
** @author Marek Przeczek */
--- 41,46 ----
** @see BAD_COMMAND_Exception, BAD_DATA_TYPE_Exception,
** BAD_INFO_ID_Exception, BAD_INFO_TYPE_Exception,
! ** BAD_OBJ_ID_Exception, COMMUN_Exception, UNKNOWN_Exception,
! ** UNAVAILABLE_Exception
**
** @author Marek Przeczek */
|
|
From: Pavel V. <va...@us...> - 2001-12-03 10:38:01
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv31263
Modified Files:
SnapshotImpl.java
Log Message:
chages to getAll() with info
Index: SnapshotImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/SnapshotImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SnapshotImpl.java 2001/11/20 22:31:45 1.1
--- SnapshotImpl.java 2001/12/03 10:37:57 1.2
***************
*** 49,69 ****
private LinkedList gcs = new LinkedList();
! //conf
! boolean withTraces = true;
! boolean withThreads = true;
boolean withCPU = true;
boolean withAlloc = true;
boolean withMon = true;
! //boolean withArenas = true;
boolean withGC = true;
//other
boolean haveSnapshot = false;
!
!
!
/** Creates new SnapshotImpl */
public SnapshotImpl( IProf iprof ) {
! //PENDING pass configuration
makeSnapshot( iprof );
}
--- 49,91 ----
private LinkedList gcs = new LinkedList();
! //default conf
boolean withCPU = true;
boolean withAlloc = true;
boolean withMon = true;
! //boolean withArenas = true;
boolean withGC = true;
+ boolean withTraces = true;
+ boolean withThreads = true;
+ //only traces with more hits than this will be extracted
+ int CPUTraces_MinVal = IProf.NO_OPTIONAL_ARG; //2;
+ //only traces with more allocations than this will be extracted
+ int AllocTraces_MinVal = IProf.NO_OPTIONAL_ARG; //2;
+ //only traces with more hits than this will be extracted
+ int MonTraces_MinVal = IProf.NO_OPTIONAL_ARG; //2;
//other
boolean haveSnapshot = false;
!
/** Creates new SnapshotImpl */
public SnapshotImpl( IProf iprof ) {
! makeSnapshot( iprof );
! }
!
! //maybe use soem configuration object
! public SnapshotImpl( IProf iprof, boolean withCPU, boolean withAlloc,
! boolean withMon, boolean withGC, boolean withTraces,
! boolean withThreads,
! int CPUTraces_MinVal,
! int AllocTraces_MinVal,
! int MonTraces_MinVal ) {
! this.withCPU = withCPU;
! this.withAlloc = withAlloc;
! this.withMon = withMon;
! this.withGC = withGC;
! this.withTraces = withTraces;
! this.withThreads = withThreads;
! this.CPUTraces_MinVal = CPUTraces_MinVal;
! this.AllocTraces_MinVal = AllocTraces_MinVal;
! this.MonTraces_MinVal = MonTraces_MinVal;
makeSnapshot( iprof );
}
***************
*** 83,103 ****
//Add some info like time, data, etc.
//?? use clear() or different lists
! if (withCPU || withAlloc || withMon) {
! extract( null, classes, IProf.CLASSES, iprof );
! extract( classes, methods, IProf.CLASS_METHODS, iprof );
if( withThreads ) {
! extract( null, groupThreads, IProf.GROUPS_OF_THREADS, iprof );
! extract( groupThreads, threads, IProf.GROUP_THREADS, iprof );
}
}
if( withCPU ) {
if( withTraces ) {
! extract( methods, null, IProf.CPU_METHOD_TRACES, iprof );
}
if( withThreads ) {
extract( threads, (withTraces) ? actLst : null,
! IProf.CPU_THREAD_METHODS, iprof );
if( withTraces ) {
! extract( actLst, null, IProf.CPU_THREAD_METHOD_TRACES, iprof );
}
}
--- 105,138 ----
//Add some info like time, data, etc.
//?? use clear() or different lists
! if (withCPU || withAlloc || withMon) {
! extract( null, classes, IProf.CLASSES, IProf.NO_OPTIONAL_ARG, iprof );
! //pending get class fields
! extract( classes, null, IProf.CLASS_FIELDS_STATICS, IProf.NO_OPTIONAL_ARG, iprof );
! extract( classes, null, IProf.CLASS_FIELDS_INSTANCES, IProf.NO_OPTIONAL_ARG, iprof );
! //extract( classes, methods, IProf.CLASS_METHODS, IProf.NO_OPTIONAL_ARG, iprof );
! extract( null, methods, IProf.METHODS, IProf.NO_OPTIONAL_ARG, iprof );
if( withThreads ) {
! extract( null, groupThreads, IProf.GROUPS_OF_THREADS,
! IProf.NO_OPTIONAL_ARG, iprof );
! //extract( groupThreads, threads, IProf.GROUP_THREADS,
! // IProf.NO_OPTIONAL_ARG, iprof );
! extract( null, threads, IProf.THREADS,
! IProf.NO_OPTIONAL_ARG, iprof );
}
}
if( withCPU ) {
if( withTraces ) {
! //extract( methods, null, IProf.CPU_METHOD_TRACES,
! // CPUTraces_MinVal, iprof );
! extract( null, null, IProf.CPU_TRACES,
! CPUTraces_MinVal, iprof );
}
if( withThreads ) {
extract( threads, (withTraces) ? actLst : null,
! IProf.CPU_THREAD_METHODS,
! IProf.NO_OPTIONAL_ARG, iprof );
if( withTraces ) {
! extract( actLst, null, IProf.CPU_THREAD_METHOD_TRACES,
! CPUTraces_MinVal, iprof );
}
}
***************
*** 108,117 ****
actLst.clear();
//PENDING
! extract( null, actLst3, IProf.OBJECT_TYPES, iprof );
extract( actLst3, (withTraces)? actLst : null,
! IProf.ALLOC_OBJECT_METHODS, iprof );
if( withTraces ) {
! extract( methods, null, IProf.ALLOC_METHOD_TRACES, iprof );
! extract( actLst, null, IProf.ALLOC_OBJECT_METHOD_TRACES, iprof );
}
if( withThreads ) {
--- 143,158 ----
actLst.clear();
//PENDING
! extract( null, actLst3, IProf.OBJECT_TYPES,
! IProf.NO_OPTIONAL_ARG, iprof );
extract( actLst3, (withTraces)? actLst : null,
! IProf.ALLOC_OBJECT_METHODS,
! IProf.NO_OPTIONAL_ARG, iprof );
if( withTraces ) {
! //extract( methods, null, IProf.ALLOC_METHOD_TRACES,
! // AllocTraces_MinVal, iprof );
! extract( null, null, IProf.ALLOC_TRACES,
! AllocTraces_MinVal, iprof );
! extract( actLst, null, IProf.ALLOC_OBJECT_METHOD_TRACES,
! AllocTraces_MinVal, iprof );
}
if( withThreads ) {
***************
*** 119,132 ****
actLst2.clear();
actLst3.clear();
! extract( threads, null, IProf.ALLOC_THREAD_OBJECTS, iprof );
! extract( threads, actLst, IProf.ALLOC_THREAD_METHODS, iprof );
if( withTraces ) {
! extract( actLst, null, IProf.ALLOC_THREAD_METHOD_TRACES, iprof );
}
extract( actLst, (withTraces)? actLst2 : null,
! IProf.ALLOC_THREAD_OBJECT_METHODS, iprof );
if( withTraces ) {
extract( actLst2, null, IProf.ALLOC_THREAD_OBJECT_METHOD_TRACES,
! iprof);
}
}
--- 160,177 ----
actLst2.clear();
actLst3.clear();
! extract( threads, null, IProf.ALLOC_THREAD_OBJECTS,
! IProf.NO_OPTIONAL_ARG, iprof );
! extract( threads, actLst, IProf.ALLOC_THREAD_METHODS,
! IProf.NO_OPTIONAL_ARG, iprof );
if( withTraces ) {
! extract( actLst, null, IProf.ALLOC_THREAD_METHOD_TRACES,
! AllocTraces_MinVal, iprof );
}
extract( actLst, (withTraces)? actLst2 : null,
! IProf.ALLOC_THREAD_OBJECT_METHODS,
! IProf.NO_OPTIONAL_ARG, iprof );
if( withTraces ) {
extract( actLst2, null, IProf.ALLOC_THREAD_OBJECT_METHOD_TRACES,
! AllocTraces_MinVal, iprof);
}
}
***************
*** 134,145 ****
if( withMon ) {
if( withTraces ) {
! extract( methods, null, IProf.MON_METHOD_TRACES, iprof );
}
if( withThreads ) {
actLst.clear();
extract( threads, (withTraces) ? actLst : null,
! IProf.MON_THREAD_METHODS, iprof );
if( withTraces ) {
! extract( actLst, null, IProf.MON_THREAD_METHOD_TRACES, iprof );
}
}
--- 179,195 ----
if( withMon ) {
if( withTraces ) {
! //extract( methods, null, IProf.MON_METHOD_TRACES,
! // IProf.NO_OPTIONAL_ARG, iprof );
! extract( null, null, IProf.MON_TRACES,
! IProf.NO_OPTIONAL_ARG, iprof );
}
if( withThreads ) {
actLst.clear();
extract( threads, (withTraces) ? actLst : null,
! IProf.MON_THREAD_METHODS,
! IProf.NO_OPTIONAL_ARG, iprof );
if( withTraces ) {
! extract( actLst, null, IProf.MON_THREAD_METHOD_TRACES,
! MonTraces_MinVal, iprof );
}
}
***************
*** 147,154 ****
//?//PENDING
//if ( withArenas ) {
! // extract( null, arenas, IProf.ARENAS );
//}
if ( withGC ) {
! extract( null, gcs, IProf.GCS, iprof );
}
}
--- 197,204 ----
//?//PENDING
//if ( withArenas ) {
! // extract( null, arenas, IProf.NO_OPTIONAL_ARG, IProf.ARENAS );
//}
if ( withGC ) {
! extract( null, gcs, IProf.GCS, IProf.NO_OPTIONAL_ARG, iprof );
}
}
***************
*** 308,313 ****
*(data classes will have constructors for Buffer)
*/
! private void extract( List in, List out, int whatType, IProf iprof )
! throws COMMUN_Exception { //trhows
boolean pass = false;
ListIterator iter, iterInner;
--- 358,363 ----
*(data classes will have constructors for Buffer)
*/
! private void extract( List in, List out, int whatType, int optArg, IProf iprof )
! throws COMMUN_Exception { //throws
boolean pass = false;
ListIterator iter, iterInner;
***************
*** 316,320 ****
IDObjectData obj, objInner, objOpposite;
! if ( in != null ) {
pass = true;
iter = null;
--- 366,370 ----
IDObjectData obj, objInner, objOpposite;
! if ( in == null ) {
pass = true;
iter = null;
***************
*** 330,334 ****
//IProf.sInfo ci = (IProf.sClassInfo)iprof.getInfo( sid.infoId, IProf.CLASS_INFO);
if ( iter == null ) {
! listInner = iprof.getAll( 0, whatType );
pass = false;
obj = null;
--- 380,385 ----
//IProf.sInfo ci = (IProf.sClassInfo)iprof.getInfo( sid.infoId, IProf.CLASS_INFO);
if ( iter == null ) {
! listInner = iprof.getAll( 0, whatType,
! IProf.isObjWithInfo( whatType), optArg );
pass = false;
obj = null;
***************
*** 336,345 ****
else{
obj = (IDObjectData) iter.next();
! listInner = iprof.getAll( obj.getID(), whatType );
}
//Prof.sInfo will be in IProf.sId
//fill in the former calling, there will be special param
iterInner = listInner.listIterator();
while( iterInner.hasNext() ) {
sid = (IProf.sID) iterInner.next();
//this could by factory
--- 387,402 ----
else{
obj = (IDObjectData) iter.next();
! listInner = iprof.getAll( obj.getID(), whatType,
! IProf.isObjWithInfo( whatType), optArg );
}
//Prof.sInfo will be in IProf.sId
//fill in the former calling, there will be special param
iterInner = listInner.listIterator();
+ //dbg
+ int i=0;
+ try {
while( iterInner.hasNext() ) {
+ //dbg
+ i++;
sid = (IProf.sID) iterInner.next();
//this could by factory
***************
*** 349,352 ****
--- 406,411 ----
out.add( objInner );
}
+ //dbg
+ }catch (Exception e) { System.out.print("zz");};
}
}
***************
*** 367,373 ****
System.out.println( "Uknown exception\n" );
}
};
! private static IDObjectData createAndPutIn( int whatType, IProf.sID sid,
IDObjectData refObj ) {
switch( whatType ) {
--- 426,436 ----
System.out.println( "Uknown exception\n" );
}
+ catch ( Exception e ) {
+ System.out.println( "Bad objID\n" );
+ }
+
};
! private IDObjectData createAndPutIn( int whatType, IProf.sID sid,
IDObjectData refObj ) {
switch( whatType ) {
***************
*** 375,600 ****
return new ClassData( sid );
}
case IProf.OBJECT_TYPES: {
! return new AllocClassData( sid, null ); //sid.info.left
}
! // case IProf.THREADS: { //??should I support this?
! // return new ThreadData( sid );
! // break;
! // }
case IProf.GROUPS_OF_THREADS: {
return new ThreadGroupData( sid );
}
case IProf.ARENAS: {
return new AllocArenaData( sid );
}
case IProf.GCS: {
return new GCData( sid );
}
case IProf.GROUP_THREADS: {
! ThreadGroupData rf = (ThreadGroupData) refObj;
! ThreadData newObj = new ThreadData( sid, rf, null ); //?z info
! rf.addThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
// case IProf.CLASS_FIELDS_STATICS: return new ClassData( sid );
// case IProf.CLASS_FIELDS_INSTANCES: return new ClassData( sid );
! // case IProf.CLASS_METHODS: { //shoul I support this
! // return new MethodData( sid );
! // break;
! // }
case IProf.ALLOC_METHOD_TRACES: {
MethodData rf = (MethodData) refObj;
AllocTraceData newObj = new AllocTraceData( sid, rf );
rf.addAllocTrace( newObj );
- //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_METHOD_OBJECTS: {
! MethodData rf = (MethodData) refObj;
! AllocClassMethodData newObj = new AllocClassMethodData( sid, null, rf ); //sid.info.up
! rf.addClass( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_OBJECT_METHODS: {
! AllocClassData rf = (AllocClassData) refObj;
! AllocClassMethodData newObj = new AllocClassMethodData( sid, rf, null ); //sid.info.left
! rf.addMethod( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_TRACE_OBJECTS: {
! AllocTraceData rf = (AllocTraceData) refObj;
! AllocClassTraceData newObj = new AllocClassTraceData( sid, null, rf ); //sid.info.left
! rf.addClass( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_OBJECT_METHOD_TRACES:{
! AllocClassMethodData rf = (AllocClassMethodData) refObj;
! AllocClassTraceData newObj = new AllocClassTraceData( sid, rf, null ); //sid.info.left
! rf.addTrace( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_OBJECT_THREADS: {
! AllocClassData rf = (AllocClassData) refObj;
! AllocThreadClassData newObj = new AllocThreadClassData( sid, null, rf ); //sid.info.left]
! rf.addThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_THREAD_OBJECTS: {
! ThreadData rf = (ThreadData) refObj;
! AllocThreadClassData newObj = new AllocThreadClassData( sid, rf, null ); //sid.info.left
! rf.addClass( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_OBJECT_METHOD_THREADS:{
! AllocClassMethodData rf =(AllocClassMethodData) refObj;
AllocThreadClassMethodData newObj = new AllocThreadClassMethodData(
! sid, null, rf, null ); //sid.info.left
! rf.addThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_THREAD_OBJECT_METHODS:{
! AllocThreadClassData rf = (AllocThreadClassData) refObj;
AllocThreadClassMethodData newObj = new AllocThreadClassMethodData(
! sid, rf, null, null ); //sid.info.left
! rf.addMethod( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_THREAD_METHOD_OBJECTS:{
! AllocThreadMethodData rf = (AllocThreadMethodData) refObj;
AllocThreadClassMethodData newObj = new AllocThreadClassMethodData(
! sid, null, null, rf ); //sid.info.left
! rf.addClass( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_OBJECT_METHOD_TRACE_THREADS:{
! AllocClassTraceData rf = (AllocClassTraceData) refObj;
AllocThreadClassTraceData newObj = new AllocThreadClassTraceData(
! sid, rf, null, null ); //sid.info.left
! rf.addThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
! }
case IProf.ALLOC_THREAD_METHOD_TRACE_OBJECTS:{
! AllocThreadTraceData rf = (AllocThreadTraceData) refObj;
AllocThreadClassTraceData newObj = new AllocThreadClassTraceData(
! sid, null, null, rf ); //sid.info.left
! rf.addClass( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_THREAD_OBJECT_METHOD_TRACES:{
! AllocThreadClassMethodData rf = (AllocThreadClassMethodData) refObj;
AllocThreadClassTraceData newObj = new AllocThreadClassTraceData(
! sid, null, rf, null ); //sid.info.left
! rf.addTrace( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_THREAD_METHODS: {
! ThreadData rf =(ThreadData) refObj;
AllocThreadMethodData newObj = new AllocThreadMethodData(
! sid, rf, null ); //sid.info.left
! rf.addAllocMethod( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.ALLOC_THREAD_METHOD_TRACES:{
! AllocThreadMethodData rf = (AllocThreadMethodData) refObj;
AllocThreadTraceData newObj = new AllocThreadTraceData(
! sid, rf, null ); //sid.info.left
! rf.addTrace( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
!
case IProf.CPU_METHOD_TRACES: {
! MethodData rf = (MethodData) refObj;
! CPUTraceData newObj = new CPUTraceData( sid, rf );
! rf.addCPUTrace( newObj );
return newObj;
}
case IProf.CPU_METHOD_THREADS: {
! MethodData rf = (MethodData) refObj;
! CPUThreadMethodData newObj = new CPUThreadMethodData( sid, null, rf ); //sid.info.left
! rf.addCPUThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.CPU_THREAD_METHODS: {
! ThreadData rf = (ThreadData) refObj;
! CPUThreadMethodData newObj = new CPUThreadMethodData( sid, rf, null ); //sid.info.left
! rf.addCPUMethod( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.CPU_METHOD_TRACE_THREADS:{
! CPUTraceData rf = (CPUTraceData) refObj;
! CPUThreadTraceData newObj = new CPUThreadTraceData( sid, null, rf ); //sid.info.left
! rf.addThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.CPU_THREAD_METHOD_TRACES:{
! CPUThreadMethodData rf = (CPUThreadMethodData) refObj;
! CPUThreadTraceData newObj = new CPUThreadTraceData( sid, rf, null ); //sid.info.left
! rf.addTrace( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
!
case IProf.MON_METHOD_TRACES: {
! MethodData rf = (MethodData) refObj;
! MonTraceData newObj = new MonTraceData( sid, rf );
! rf.addMonTrace( newObj );
return newObj;
}
case IProf.MON_METHOD_THREADS: {
! MethodData rf = (MethodData) refObj;
! MonThreadMethodData newObj = new MonThreadMethodData( sid, null, rf ); //sid.info.left
! rf.addMonThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.MON_THREAD_METHODS: {
! ThreadData rf = (ThreadData) refObj;
! MonThreadMethodData newObj = new MonThreadMethodData( sid, rf, null ); //sid.info.left
! rf.addMonMethod( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.MON_METHOD_TRACE_THREADS:{
! MonTraceData rf = (MonTraceData) refObj;
! MonThreadTraceData newObj = new MonThreadTraceData( sid, null, rf ); //sid.info.left
! rf.addThread( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
case IProf.MON_THREAD_METHOD_TRACES:{
! MonThreadMethodData rf = (MonThreadMethodData) refObj;
! MonThreadTraceData newObj = new MonThreadTraceData( sid, rf, null ); //sid.info.left
! rf.addTrace( newObj );
! //PENDING connect to object from sid.info
return newObj;
}
- // case IProf.MON_TRACES: return new ClassData( sid );
//PENDING
default:
return null;
//throw some excetion
}
};
-
-
//toString()
--- 438,779 ----
return new ClassData( sid );
}
+
case IProf.OBJECT_TYPES: {
! //get class reference
! return new AllocClassData( sid, null );
}
!
case IProf.GROUPS_OF_THREADS: {
return new ThreadGroupData( sid );
}
+
case IProf.ARENAS: {
return new AllocArenaData( sid );
}
+
case IProf.GCS: {
return new GCData( sid );
}
+ ////
+ case IProf.THREADS: {
+ ThreadGroupData up = (ThreadGroupData)
+ libIDs.get( new Integer( sid.parentUpObjId ));
+ ThreadData parent = (ThreadData) libIDs.get( new Integer(
+ ((IProf.sThreadInfo) sid.info).parentObjId));
+ ThreadData newObj = new ThreadData( sid, up, parent );
+ up.addThread( newObj );
+ parent.addChild( newObj );
+ return newObj;
+ }
case IProf.GROUP_THREADS: {
! ThreadGroupData up = (ThreadGroupData) refObj;
! ThreadData parent = (ThreadData) libIDs.get( new Integer(
! ((IProf.sThreadInfo) sid.info).parentObjId));
! ThreadData newObj = new ThreadData( sid, up, parent );
! up.addThread( newObj );
! parent.addChild( newObj );
return newObj;
}
+ ////
// case IProf.CLASS_FIELDS_STATICS: return new ClassData( sid );
+
// case IProf.CLASS_FIELDS_INSTANCES: return new ClassData( sid );
! ////
! case IProf.METHODS: {
! ClassData up = (ClassData) libIDs.get( new Integer(sid.parentUpObjId) );
! MethodData newObj = new MethodData( sid, up );
! // up.addMethod( newObj ); //FIXME
! return newObj;
! }
! case IProf.CLASS_METHODS: {
! ClassData up = (ClassData) refObj;
! MethodData newObj = new MethodData( sid, up );
! // up.addMethod( newObj ); //FIXME
! return newObj;
! }
! ////
! ////******************
case IProf.ALLOC_METHOD_TRACES: {
MethodData rf = (MethodData) refObj;
AllocTraceData newObj = new AllocTraceData( sid, rf );
rf.addAllocTrace( newObj );
return newObj;
}
+
case IProf.ALLOC_METHOD_OBJECTS: {
! MethodData lf = (MethodData) refObj;
! AllocClassData up = (AllocClassData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! AllocClassMethodData newObj = new AllocClassMethodData( sid, up, lf );
! lf.addClass( newObj );
! up.addMethod( newObj );
return newObj;
}
case IProf.ALLOC_OBJECT_METHODS: {
! MethodData lf = (MethodData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! AllocClassData up = (AllocClassData) refObj;
! AllocClassMethodData newObj = new AllocClassMethodData( sid, up, lf );
! lf.addClass( newObj );
! up.addMethod( newObj );
return newObj;
}
+ ////
case IProf.ALLOC_TRACE_OBJECTS: {
! AllocClassMethodData up = (AllocClassMethodData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! AllocTraceData lf = (AllocTraceData) refObj;
! AllocClassTraceData newObj = new AllocClassTraceData( sid, up, lf );
! lf.addClass( newObj );
! up.addTrace( newObj );
return newObj;
}
case IProf.ALLOC_OBJECT_METHOD_TRACES:{
! AllocClassMethodData up = (AllocClassMethodData) refObj;
! AllocTraceData lf = (AllocTraceData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! AllocClassTraceData newObj = new AllocClassTraceData( sid, up, lf );
! lf.addClass( newObj );
! up.addTrace( newObj );
return newObj;
}
+ ////
case IProf.ALLOC_OBJECT_THREADS: {
! AllocClassData lf = (AllocClassData) refObj;
! ThreadData up = (ThreadData) libIDs.get( new Integer( sid.parentUpObjId));
! AllocThreadClassData newObj = new AllocThreadClassData( sid, up, lf );
! up.addClass( newObj );
! lf.addThread( newObj );
return newObj;
}
case IProf.ALLOC_THREAD_OBJECTS: {
! AllocClassData lf = (AllocClassData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! ThreadData up = (ThreadData) refObj;
! AllocThreadClassData newObj = new AllocThreadClassData( sid, up, lf );
! lf.addThread( newObj );
! up.addClass( newObj );
return newObj;
}
+ ////
case IProf.ALLOC_OBJECT_METHOD_THREADS:{
! AllocClassMethodData lf =(AllocClassMethodData) refObj;
! AllocThreadClassData up = (AllocThreadClassData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! AllocThreadMethodData rg = (AllocThreadMethodData)
! libIDs.get( new Integer( sid.parentRightObjId ));
AllocThreadClassMethodData newObj = new AllocThreadClassMethodData(
! sid, up, lf, rg );
! lf.addThread( newObj );
! up.addMethod( newObj );
! rg.addClass( newObj );
return newObj;
}
case IProf.ALLOC_THREAD_OBJECT_METHODS:{
! AllocClassMethodData lf =(AllocClassMethodData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! AllocThreadClassData up = (AllocThreadClassData) refObj;
! AllocThreadMethodData rg = (AllocThreadMethodData)
! libIDs.get( new Integer( sid.parentRightObjId ));
AllocThreadClassMethodData newObj = new AllocThreadClassMethodData(
! sid, up, lf, rg );
! lf.addThread( newObj );
! up.addMethod( newObj );
! rg.addClass( newObj );
return newObj;
}
case IProf.ALLOC_THREAD_METHOD_OBJECTS:{
! AllocClassMethodData lf =(AllocClassMethodData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! AllocThreadClassData up = (AllocThreadClassData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! AllocThreadMethodData rg = (AllocThreadMethodData) refObj;
AllocThreadClassMethodData newObj = new AllocThreadClassMethodData(
! sid, up, lf, rg );
! lf.addThread( newObj );
! up.addMethod( newObj );
! rg.addClass( newObj );
return newObj;
}
+ ////
case IProf.ALLOC_OBJECT_METHOD_TRACE_THREADS:{
! AllocClassTraceData lf = (AllocClassTraceData) refObj;
! AllocThreadClassMethodData up = (AllocThreadClassMethodData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! AllocThreadTraceData rg = (AllocThreadTraceData)
! libIDs.get( new Integer( sid.parentRightObjId ));
AllocThreadClassTraceData newObj = new AllocThreadClassTraceData(
! sid, lf, up, rg );
! lf.addThread( newObj );
! up.addTrace( newObj );
! rg.addClass( newObj );
return newObj;
! }
case IProf.ALLOC_THREAD_METHOD_TRACE_OBJECTS:{
! AllocClassTraceData lf = (AllocClassTraceData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! AllocThreadClassMethodData up = (AllocThreadClassMethodData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! AllocThreadTraceData rg = (AllocThreadTraceData) refObj;
AllocThreadClassTraceData newObj = new AllocThreadClassTraceData(
! sid, lf, up, rg );
! lf.addThread( newObj );
! up.addTrace( newObj );
! rg.addClass( newObj );
return newObj;
}
case IProf.ALLOC_THREAD_OBJECT_METHOD_TRACES:{
! AllocClassTraceData lf = (AllocClassTraceData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! AllocThreadClassMethodData up = (AllocThreadClassMethodData) refObj;
! AllocThreadTraceData rg = (AllocThreadTraceData)
! libIDs.get( new Integer( sid.parentRightObjId ));
AllocThreadClassTraceData newObj = new AllocThreadClassTraceData(
! sid, lf, up, rg );
! lf.addThread( newObj );
! up.addTrace( newObj );
! rg.addClass( newObj );
return newObj;
}
+ ////
case IProf.ALLOC_THREAD_METHODS: {
! MethodData lf = (MethodData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! ThreadData up =(ThreadData) refObj;
AllocThreadMethodData newObj = new AllocThreadMethodData(
! sid, up, lf );
! up.addAllocMethod( newObj );
! // lf.addAllocThread( newObj ); //FIXME
return newObj;
}
+ ////
case IProf.ALLOC_THREAD_METHOD_TRACES:{
! AllocTraceData lf = (AllocTraceData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! AllocThreadMethodData up = (AllocThreadMethodData) refObj;
AllocThreadTraceData newObj = new AllocThreadTraceData(
! sid, up, lf );
! up.addTrace( newObj );
! // lf.addThread( newObj ); //FIXME
return newObj;
}
!
! //this is not implemented in IProf, yet??
! //case IProf.ALLOC_METHOD_THREADS
! //case IProf.ALLOC_TRACE_THREADS
! ////
! ////******************
! case IProf.CPU_TRACES: {
! MethodData up = (MethodData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! CPUTraceData newObj = new CPUTraceData( sid, up );
! up.addCPUTrace( newObj );
! return newObj;
! }
case IProf.CPU_METHOD_TRACES: {
! MethodData up = (MethodData) refObj;
! CPUTraceData newObj = new CPUTraceData( sid, up );
! up.addCPUTrace( newObj );
return newObj;
}
+ ////
case IProf.CPU_METHOD_THREADS: {
! MethodData lf = (MethodData) refObj;
! ThreadData up = (ThreadData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! CPUThreadMethodData newObj = new CPUThreadMethodData( sid, up, lf );
! lf.addCPUThread( newObj );
! up.addCPUMethod( newObj );
return newObj;
}
case IProf.CPU_THREAD_METHODS: {
! MethodData lf = (MethodData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! ThreadData up = (ThreadData) refObj;
! CPUThreadMethodData newObj = new CPUThreadMethodData( sid, up, lf );
! lf.addCPUThread( newObj );
! up.addCPUMethod( newObj );
return newObj;
}
+ ////
case IProf.CPU_METHOD_TRACE_THREADS:{
! CPUTraceData lf = (CPUTraceData) refObj;
! CPUThreadMethodData up = (CPUThreadMethodData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! CPUThreadTraceData newObj = new CPUThreadTraceData( sid, up, lf );
! lf.addThread( newObj );
! up.addTrace( newObj );
return newObj;
}
case IProf.CPU_THREAD_METHOD_TRACES:{
! CPUTraceData lf = (CPUTraceData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! CPUThreadMethodData up = (CPUThreadMethodData) refObj;
! CPUThreadTraceData newObj = new CPUThreadTraceData( sid, up, lf );
! lf.addThread( newObj );
! up.addTrace( newObj );
return newObj;
}
! /////
! ////******************
case IProf.MON_METHOD_TRACES: {
! MethodData up = (MethodData) refObj;
! MonTraceData newObj = new MonTraceData( sid, up );
! up.addMonTrace( newObj );
return newObj;
}
+ case IProf.MON_TRACES: {
+ MethodData up = (MethodData)
+ libIDs.get( new Integer( sid.parentUpObjId ));
+ MonTraceData newObj = new MonTraceData( sid, up );
+ up.addMonTrace( newObj );
+ return newObj;
+ }
+ /////
case IProf.MON_METHOD_THREADS: {
! MethodData lf = (MethodData) refObj;
! ThreadData up = (ThreadData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! MonThreadMethodData newObj = new MonThreadMethodData( sid, up, lf );
! lf.addMonThread( newObj );
! up.addMonMethod( newObj );
return newObj;
}
case IProf.MON_THREAD_METHODS: {
! MethodData lf = (MethodData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! ThreadData up = (ThreadData) refObj;
! MonThreadMethodData newObj = new MonThreadMethodData( sid, up, lf );
! lf.addMonThread( newObj );
! up.addMonMethod( newObj );
return newObj;
}
+ /////
case IProf.MON_METHOD_TRACE_THREADS:{
! MonTraceData lf = (MonTraceData) refObj;
! MonThreadMethodData up = (MonThreadMethodData)
! libIDs.get( new Integer( sid.parentUpObjId ));
! MonThreadTraceData newObj = new MonThreadTraceData( sid, up, lf );
! lf.addThread( newObj );
! up.addTrace( newObj );
return newObj;
}
case IProf.MON_THREAD_METHOD_TRACES:{
! MonTraceData lf = (MonTraceData)
! libIDs.get( new Integer( sid.parentLeftObjId ));
! MonThreadMethodData up = (MonThreadMethodData) refObj;
! MonThreadTraceData newObj = new MonThreadTraceData( sid, up, lf );
! lf.addThread( newObj );
! up.addTrace( newObj );
return newObj;
}
//PENDING
default:
return null;
//throw some excetion
+
}
};
//toString()
***************
*** 602,614 ****
}
- //??
- //Constrocts for Data object from Buffer
- //concting to tree in obejcts?
//TODO:
// write exception handling code properly
/*
* $Log$
* Revision 1.1 2001/11/20 22:31:45 vachis
* Snapshot implementation
--- 781,795 ----
}
//TODO:
// write exception handling code properly
+ //write passing configuration
+
/*
* $Log$
+ * Revision 1.2 2001/12/03 10:37:57 vachis
+ * chages to getAll() with info
+ *
* Revision 1.1 2001/11/20 22:31:45 vachis
* Snapshot implementation
|
|
From: Pavel V. <va...@us...> - 2001-12-03 10:13:24
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv24858
Modified Files:
ThreadData.java
Log Message:
addChild() fix
Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ThreadData.java 2001/12/02 15:54:40 1.6
--- ThreadData.java 2001/12/03 10:13:19 1.7
***************
*** 162,166 ****
* @param child child of this thread.
*/
! void addChild(AllocThreadClassData child) {
children.add(child);
}
--- 162,166 ----
* @param child child of this thread.
*/
! void addChild(ThreadData child) {
children.add(child);
}
***************
*** 286,289 ****
--- 286,292 ----
/*
* $Log$
+ * Revision 1.7 2001/12/03 10:13:19 vachis
+ * addChild() fix
+ *
* Revision 1.6 2001/12/02 15:54:40 petrul
* changed constructor code
|
|
From: Pavel V. <va...@us...> - 2001-12-03 10:02:26
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun
In directory usw-pr-cvs1:/tmp/cvs-serv21880
Modified Files:
IProf.java
Log Message:
auxiliary function for recognition info objects
Index: IProf.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun/IProf.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** IProf.java 2001/11/27 23:56:31 1.6
--- IProf.java 2001/12/03 10:02:23 1.7
***************
*** 1738,1740 ****
--- 1738,1776 ----
}
}
+
+ /** Returns true if operation extracts objets, which have their own info.
+ **(I can call getInfo or getAll with 'includeInfo' argument for them)
+ **
+ ** @param opType type of operation for getAll()/getChanged() methods
+ **
+ ** @return true if operation extracts objets, which have their own info.
+ **
+ ** @see getChanged(), getData(), getAll(), getInfo()
+ **/
+ public static boolean isObjWithInfo( int opType ) {
+ switch( opType) {
+
+ case CLASSES:
+ case METHODS:
+ case CLASS_METHODS:
+ case CPU_METHOD_TRACES:
+ case ALLOC_METHOD_TRACES:
+ case MON_METHOD_TRACES:
+ case CPU_TRACES:
+ case ALLOC_TRACES:
+ case MON_TRACES:
+ case OBJECT_TYPES:
+ case GROUPS_OF_THREADS:
+ case GROUP_THREADS:
+ case THREADS:
+ //??
+ case CLASS_FIELDS_STATICS:
+ case CLASS_FIELDS_INSTANCES:
+
+ return true;
+
+ default:
+ return false;
+ }
+ }
};
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 15:58:00
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv5122/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
ThreadGroupData.java
Log Message:
changed constructor code
Index: ThreadGroupData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadGroupData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ThreadGroupData.java 2001/11/20 22:23:37 1.3
--- ThreadGroupData.java 2001/12/02 15:57:56 1.4
***************
*** 56,61 ****
*/
ThreadGroupData( IProf.sID sid ) {
! this( sid.objId, "" ); //sid...method );
! //PENDING
}
--- 56,60 ----
*/
ThreadGroupData( IProf.sID sid ) {
! this(sid.objId, ((IProf.sThreadGroupInfo)sid.info).groupName);
}
***************
*** 100,103 ****
--- 99,105 ----
/*
* $Log$
+ * Revision 1.4 2001/12/02 15:57:56 petrul
+ * changed constructor code
+ *
* Revision 1.3 2001/11/20 22:23:37 vachis
* Contructors from IProf.sID and monitors statistic info
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 15:54:45
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv4431/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
ThreadData.java
Log Message:
changed constructor code
Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ThreadData.java 2001/11/20 22:23:37 1.5
--- ThreadData.java 2001/12/02 15:54:40 1.6
***************
*** 96,101 ****
*/
ThreadData( IProf.sID sid, ThreadGroupData group, ThreadData parent ) {
! this( sid.objId, "", group, parent, false ); //sid...method );
! //PENDING
}
--- 96,103 ----
*/
ThreadData( IProf.sID sid, ThreadGroupData group, ThreadData parent ) {
! this(sid.objId, ((IProf.sThreadInfo)sid.info).threadName, group,
! parent, sid.active);
! if (sid.alloc != null)
! setStatistics(sid.alloc);
}
***************
*** 284,287 ****
--- 286,292 ----
/*
* $Log$
+ * Revision 1.6 2001/12/02 15:54:40 petrul
+ * changed constructor code
+ *
* Revision 1.5 2001/11/20 22:23:37 vachis
* Contructors from IProf.sID and monitors statistic info
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 15:33:33
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv932/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
MonTraceData.java
Log Message:
changed constructor code
Index: MonTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonTraceData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MonTraceData.java 2001/11/20 22:28:50 1.1
--- MonTraceData.java 2001/12/02 15:33:30 1.2
***************
*** 69,73 ****
MonTraceData( IProf.sID sid, MethodData method ) {
this( sid.objId, method, null ); //sid...method );
! //PENDING
}
--- 69,74 ----
MonTraceData( IProf.sID sid, MethodData method ) {
this( sid.objId, method, null ); //sid...method );
! if (sid.mon!=null)
! addToMonStat(sid.mon.hits, sid.mon.time);
}
***************
*** 124,127 ****
--- 125,131 ----
/*
* $Log$
+ * Revision 1.2 2001/12/02 15:33:30 petrul
+ * changed constructor code
+ *
* Revision 1.1 2001/11/20 22:28:50 vachis
* Monitors data classes
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 15:31:19
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv653/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
MonThreadTraceData.java
Log Message:
changed constructor code
Index: MonThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonThreadTraceData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MonThreadTraceData.java 2001/11/20 22:28:50 1.1
--- MonThreadTraceData.java 2001/12/02 15:31:16 1.2
***************
*** 62,66 ****
MonTraceData trace ) {
this( sid.objId, threadMethod, trace );
! //PENDING
}
--- 62,67 ----
MonTraceData trace ) {
this( sid.objId, threadMethod, trace );
! if (sid.mon!=null)
! addToMonStat(sid.mon.hits, sid.mon.time);
}
***************
*** 87,90 ****
--- 88,94 ----
/*
* $Log$
+ * Revision 1.2 2001/12/02 15:31:16 petrul
+ * changed constructor code
+ *
* Revision 1.1 2001/11/20 22:28:50 vachis
* Monitors data classes
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 15:29:15
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv32698/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
MonThreadMethodData.java
Log Message:
changed constructor code
Index: MonThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonThreadMethodData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MonThreadMethodData.java 2001/11/20 22:28:50 1.1
--- MonThreadMethodData.java 2001/12/02 15:29:13 1.2
***************
*** 65,69 ****
MonThreadMethodData( IProf.sID sid, ThreadData thread, MethodData method ) {
this( sid.objId, thread, method );
! //PENDING
}
--- 65,70 ----
MonThreadMethodData( IProf.sID sid, ThreadData thread, MethodData method ) {
this( sid.objId, thread, method );
! if (sid.mon!=null)
! addToMonStat(sid.mon.hits, sid.mon.time);
}
***************
*** 120,123 ****
--- 121,127 ----
/*
* $Log$
+ * Revision 1.2 2001/12/02 15:29:13 petrul
+ * changed constructor code
+ *
* Revision 1.1 2001/11/20 22:28:50 vachis
* Monitors data classes
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 15:18:46
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv30972/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
MethodData.java
Log Message:
changed constructor code
Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** MethodData.java 2001/11/20 22:23:37 1.5
--- MethodData.java 2001/12/02 15:18:43 1.6
***************
*** 126,131 ****
*/
MethodData( IProf.sID sid, ClassData clazz ) {
! this( sid.objId, "", "", 0, 0, clazz ); //sid...method );
! //PENDING
}
--- 126,143 ----
*/
MethodData( IProf.sID sid, ClassData clazz ) {
! this(sid.objId, ((IProf.sMethodInfo)sid.info).methodName,
! ((IProf.sMethodInfo)sid.info).methodSignature,
! ((IProf.sMethodInfo)sid.info).startLineno,
! ((IProf.sMethodInfo)sid.info).endLineno, clazz);
! if (sid.cpu!=null)
! addToCPUStat(sid.cpu.hits, sid.cpu.pureTime);
! if (sid.mon!=null)
! addToMonStat(sid.mon.hits, sid.mon.time);
! if (sid.alloc!=null) {
! numLiveInstances=sid.alloc.allocNumInstancesLive;
! numTotalInstances=sid.alloc.allocNumInstancesTotal;
! sizeLiveInstances=sid.alloc.allocSizeInstancesLive;
! sizeTotalInstances=sid.alloc.allocSizeInstancesTotal;
! }
}
***************
*** 469,472 ****
--- 481,487 ----
/*
* $Log$
+ * Revision 1.6 2001/12/02 15:18:43 petrul
+ * changed constructor code
+ *
* Revision 1.5 2001/11/20 22:23:37 vachis
* Contructors from IProf.sID and monitors statistic info
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 14:48:11
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv26263/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
GCData.java
Log Message:
changed constructor code
Index: GCData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/GCData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** GCData.java 2001/11/20 22:23:37 1.3
--- GCData.java 2001/12/02 14:48:06 1.4
***************
*** 65,70 ****
*/
GCData( IProf.sID sid ) {
! this( sid.objId, 0, 0, 0, 0, 0 ); //sid...method );
! //PENDING
}
--- 65,73 ----
*/
GCData( IProf.sID sid ) {
! this(sid.objId, ((IProf.sGCInfo)sid.info).usedObjects,
! ((IProf.sGCInfo)sid.info).usedObjectSpace,
! ((IProf.sGCInfo)sid.info).totalObjectSpace,
! ((IProf.sGCInfo)sid.info).startTime.getTime(),
! ((IProf.sGCInfo)sid.info).endTime.getTime());
}
***************
*** 118,121 ****
--- 121,127 ----
/*
* $Log$
+ * Revision 1.4 2001/12/02 14:48:06 petrul
+ * changed constructor code
+ *
* Revision 1.3 2001/11/20 22:23:37 vachis
* Contructors from IProf.sID and monitors statistic info
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 14:34:54
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv21876/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
CPUTraceData.java
Log Message:
changed constructor code
Index: CPUTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUTraceData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CPUTraceData.java 2001/11/20 22:23:37 1.4
--- CPUTraceData.java 2001/12/02 14:34:49 1.5
***************
*** 67,71 ****
CPUTraceData( IProf.sID sid, MethodData method ) {
this( sid.objId, method, null ); //sid...method );
! //PENDING
}
--- 67,72 ----
CPUTraceData( IProf.sID sid, MethodData method ) {
this( sid.objId, method, null ); //sid...method );
! if (sid.cpu!=null)
! addToCPUStat(sid.cpu.hits, sid.cpu.pureTime);
}
***************
*** 121,124 ****
--- 122,128 ----
/*
* $Log$
+ * Revision 1.5 2001/12/02 14:34:49 petrul
+ * changed constructor code
+ *
* Revision 1.4 2001/11/20 22:23:37 vachis
* Contructors from IProf.sID and monitors statistic info
|
|
From: Lukas P. <pe...@us...> - 2001-12-02 13:41:25
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv11201/net/sourceforge/javaprofiler/jpiimpl/data
Modified Files:
CPUThreadTraceData.java
Log Message:
changed constructor code
Index: CPUThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUThreadTraceData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CPUThreadTraceData.java 2001/11/20 22:23:37 1.3
--- CPUThreadTraceData.java 2001/12/02 13:41:22 1.4
***************
*** 57,61 ****
CPUTraceData trace ) {
this( sid.objId, threadMethod, trace );
! //PENDING
}
--- 57,62 ----
CPUTraceData trace ) {
this( sid.objId, threadMethod, trace );
! if (sid.cpu!=null)
! addToCPUStat(sid.cpu.hits, sid.cpu.pureTime);
}
***************
*** 82,85 ****
--- 83,89 ----
/*
* $Log$
+ * Revision 1.4 2001/12/02 13:41:22 petrul
+ * changed constructor code
+ *
* Revision 1.3 2001/11/20 22:23:37 vachis
* Contructors from IProf.sID and monitors statistic info
|
