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: Pavel V. <va...@us...> - 2002-09-07 19:38:49
|
Update of /cvsroot/javaprofiler/test/snapshot In directory usw-pr-cvs1:/tmp/cvs-serv1766 Added Files: TestDiffSnap.java Log Message: test of diff snapshot --- NEW FILE: TestDiffSnap.java --- package snapshot; //java -Xrun\Project\javaprof\library\src\profiler\profiler:commun_type=socket Notepad /* * 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.jpi.*; import net.sourceforge.javaprofiler.jpi.connect.*; import net.sourceforge.javaprofiler.jpiimpl.connect.*; /** Creates snapshot using connectors. */ public class TestDiffSnap { public Snapshot getSnapshot( VirtualMachineRef vm ) { /* SnapshotImpl.Configuration conf = new SnapshotImpl.Configuration(); conf.withCPU = true; conf.withAlloc = true; conf.withMon = true; conf.withArenas = true; conf.withGC = true; conf.withFields = true; conf.withCPUTraces = true; conf.withMonTraces = true; conf.withAllocTraces = true; conf.withCPUThreads = true; conf.withMonThreads = true; conf.withAllocThreads = true; conf.withTypes = true; conf.withCallTree = true; //only traces with more hits than this will be extracted conf.CPUTraces_MinVal = IProf.NO_OPTIONAL_ARG; //2; //only traces with more allocations than this will be extracted conf.AllocTraces_MinVal = IProf.NO_OPTIONAL_ARG; //2; //only traces with more hits than this will be extracted conf.MonTraces_MinVal = IProf.NO_OPTIONAL_ARG; //2; if ( !conf.isValid() ) System.err.print( "Error in snapshot configuration!" ); */ long start = System.currentTimeMillis(); Snapshot snap1 = vm.createSnapshot(); long end = System.currentTimeMillis(); System.out.println( "\nTime TestSnap: " + (end - start) ); return snap1; } public Snapshot makeDiffSnapshot( Snapshot snap1, Snapshot snap2 ) { System.out.println("Making diffSnapshot .."); Snapshot result = snap1.differenceTo( snap2 ); System.out.println("OK"); return result; } public void runTest() { Bootstrap.connectorManager().defaultConnector(); try { Connector con = new ShmemAttachConnector(); Map args = con.defaultArguments(); ((Connector.Argument) args.get("address")).setValue("com"); VirtualMachineRef vm= (new ShmemAttachConnector()).connect( args ); System.out.println( "Ready" ); Snapshot snap1, snap2, snapDiff; snap1 = getSnapshot( vm ); while ( !vm.isShutdown() ) { Thread.sleep( 1000); } snap2 = getSnapshot( vm ); vm.shutdown(); vm.dispose(); snapDiff = makeDiffSnapshot( snap1, snap2 ); } catch( Exception e) { System.err.println( "an error occurred, exception:"); System.err.println( e.getClass().getName()); e.printStackTrace(); } } public static void main( String[] arg) { // let's run the test (new TestDiffSnap()).runTest(); } }; //GetCurtime |
|
From: Pavel V. <va...@us...> - 2002-09-07 19:38:26
|
Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv1709
Modified Files:
TestSnap2.java TestSnap.java DebugOutput.java
Log Message:
problems in compilation fixed
Index: TestSnap2.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/TestSnap2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TestSnap2.java 11 Jul 2002 18:42:56 -0000 1.1
--- TestSnap2.java 7 Sep 2002 19:38:23 -0000 1.2
***************
*** 85,89 ****
public void runTest() {
! Bootstrap.virtualMachineManager().defaultConnector();
try {
--- 85,89 ----
public void runTest() {
! Bootstrap.connectorManager().defaultConnector();
try {
***************
*** 112,114 ****
};
! //GetCurtime
\ No newline at end of file
--- 112,114 ----
};
! //GetCurtime
Index: TestSnap.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/TestSnap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** TestSnap.java 20 Apr 2002 22:40:50 -0000 1.7
--- TestSnap.java 7 Sep 2002 19:38:23 -0000 1.8
***************
*** 131,133 ****
};
! //GetCurtime
\ No newline at end of file
--- 131,133 ----
};
! //GetCurtime
Index: DebugOutput.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/DebugOutput.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** DebugOutput.java 16 Feb 2002 16:22:18 -0000 1.4
--- DebugOutput.java 7 Sep 2002 19:38:23 -0000 1.5
***************
*** 32,36 ****
public static void print (SnapshotImpl sn) {
// classes list, ClassData object type
! Iterator it = sn.classes().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
--- 32,36 ----
public static void print (SnapshotImpl sn) {
// classes list, ClassData object type
! Iterator it = sn.getClasses().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
***************
*** 46,52 ****
}
System.out.println("INSTANCE FIELDS:");
! Iterator itI = c.getInstanceFields().iterator();
while (itI.hasNext()) {
! ClassFieldData f = (ClassFieldData) itI.next();
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
--- 46,54 ----
}
System.out.println("INSTANCE FIELDS:");
! Iterator itI = c.getFields().iterator();
while (itI.hasNext()) {
! FieldData f = (FieldData) itI.next();
! if ( f.isStatic() )
! continue;
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
***************
*** 54,60 ****
}
System.out.println("STATIC FIELDS:");
! Iterator itS = c.getStaticFields().iterator();
while (itS.hasNext()) {
! ClassFieldData f = (ClassFieldData) itS.next();
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
--- 56,64 ----
}
System.out.println("STATIC FIELDS:");
! Iterator itS = c.getFields().iterator();
while (itS.hasNext()) {
! FieldData f = (FieldData) itS.next();
! if ( !f.isStatic() )
! continue;
System.out.println(f.getName() + " SIGN = " + f.getSignature()
);
***************
*** 64,68 ****
// groupThreads list, ThreadGroupData object type
! it = sn.groupOfThreads().iterator();
while (it.hasNext()) {
ThreadGroupData g = (ThreadGroupData) it.next();
--- 68,72 ----
// groupThreads list, ThreadGroupData object type
! it = sn.getThreadGroups().iterator();
while (it.hasNext()) {
ThreadGroupData g = (ThreadGroupData) it.next();
***************
*** 76,88 ****
// objectTypes list, AllocClassData object type
! it = sn.allocTypes().iterator();
while (it.hasNext()) {
! AllocTypeData o = (AllocTypeData) it.next();
System.out.println("OBJECT TYPE:");
! ClassData c = o.getClazz();
if (c != null) System.out.println("CLASS = " + c.getName());
System.out.print("IS_ARRAY = ");
String s;
! switch (o.getArrayType()) {
case IProf.JVMPI_NORMAL_OBJECT:
s = "JVMPI_NORMAL_OBJECT";
--- 80,93 ----
// objectTypes list, AllocClassData object type
! it = sn.getTypes().iterator();
while (it.hasNext()) {
! TypeData o = (TypeData) it.next();
System.out.println("OBJECT TYPE:");
! ClassData c = (ClassData) o.getComponentClass();
if (c != null) System.out.println("CLASS = " + c.getName());
System.out.print("IS_ARRAY = ");
String s;
! //FIXME
! /*switch (o.getArrayType()) {
case IProf.JVMPI_NORMAL_OBJECT:
s = "JVMPI_NORMAL_OBJECT";
***************
*** 119,123 ****
break;
}
! System.out.println(s);
System.out.println();
}
--- 124,128 ----
break;
}
! System.out.println(s); */
System.out.println();
}
***************
*** 125,129 ****
// arenas list, AllocArenaData object type
// FIX arenas()
! it = sn.arenas().iterator();
while (it.hasNext()) {
AllocArenaData a = (AllocArenaData) it.next();
--- 130,134 ----
// arenas list, AllocArenaData object type
// FIX arenas()
! it = sn.getArenas().iterator();
while (it.hasNext()) {
AllocArenaData a = (AllocArenaData) it.next();
***************
*** 137,143 ****
// gcs list, GCData object type
// FIX gcs()
! it = sn.gcs().iterator();
while (it.hasNext()) {
! GCData g = (GCData) it.next();
System.out.println("GC:");
System.out.println("start: " + g.getStartTime());
--- 142,148 ----
// gcs list, GCData object type
// FIX gcs()
! it = sn.getGCRuns().iterator();
while (it.hasNext()) {
! GCRunData g = (GCRunData) it.next();
System.out.println("GC:");
System.out.println("start: " + g.getStartTime());
***************
*** 170,174 ****
int totalMonThreadMethods = 0;
int totalMonThreadTraces = 0;
! it = sn.classes().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
--- 175,179 ----
int totalMonThreadMethods = 0;
int totalMonThreadTraces = 0;
! it = sn.getClasses().iterator();
while (it.hasNext()) {
ClassData c = (ClassData) it.next();
***************
*** 176,190 ****
while (itM.hasNext()) {
MethodData m = (MethodData) itM.next();
! Iterator itT = m.getAllocTraces().values().iterator();
while (itT.hasNext()) {
AllocTraceData t = (AllocTraceData) itT.next();
totalAllocTraces ++;
}
! itT = m.getCPUTraces().values().iterator();
while (itT.hasNext()) {
CPUTraceData t = (CPUTraceData) itT.next();
totalCpuTraces ++;
}
! itT = m.getMonTraces().values().iterator();
while (itT.hasNext()) {
MonTraceData t = (MonTraceData) itT.next();
--- 181,195 ----
while (itM.hasNext()) {
MethodData m = (MethodData) itM.next();
! Iterator itT = m.getAllocTraces().iterator();
while (itT.hasNext()) {
AllocTraceData t = (AllocTraceData) itT.next();
totalAllocTraces ++;
}
! itT = m.getCPUTraces().iterator();
while (itT.hasNext()) {
CPUTraceData t = (CPUTraceData) itT.next();
totalCpuTraces ++;
}
! itT = m.getMonTraces().iterator();
while (itT.hasNext()) {
MonTraceData t = (MonTraceData) itT.next();
***************
*** 195,205 ****
totalClasses ++;
}
! it = sn.allocTypes().iterator();
while (it.hasNext()) {
! AllocTypeData a = (AllocTypeData) it.next();
! Iterator itM = a.getMethods().values().iterator();
while (itM.hasNext()) {
AllocTypeMethodData m = (AllocTypeMethodData) itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
AllocTypeTraceData t = (AllocTypeTraceData) itT.next();
--- 200,210 ----
totalClasses ++;
}
! it = sn.getTypes().iterator();
while (it.hasNext()) {
! TypeData a = (TypeData) it.next();
! Iterator itM = a.getAllocTypeMethods().iterator();
while (itM.hasNext()) {
AllocTypeMethodData m = (AllocTypeMethodData) itM.next();
! Iterator itT = m.getAllocTypeTraces().iterator();
while (itT.hasNext()) {
AllocTypeTraceData t = (AllocTypeTraceData) itT.next();
***************
*** 210,227 ****
totalAllocObjects ++;
}
! it = sn.threads().iterator();
while (it.hasNext()) {
ThreadData th = (ThreadData) it.next();
! Iterator itA = th.getTypes().values().iterator();
while (itA.hasNext()) {
! AllocThreadTypeData a = (AllocThreadTypeData) itA.next();
! Iterator itM = a.getMethods().values().iterator();
while (itM.hasNext()) {
! AllocThreadTypeMethodData m = (AllocThreadTypeMethodData)
itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
! AllocThreadTypeTraceData t =
! (AllocThreadTypeTraceData) itT.next();
totalAllocThreadObjectTraces ++;
}
--- 215,232 ----
totalAllocObjects ++;
}
! it = sn.getThreads().iterator();
while (it.hasNext()) {
ThreadData th = (ThreadData) it.next();
! Iterator itA = th.getAllocTypeThreads().iterator();
while (itA.hasNext()) {
! AllocTypeThreadData a = (AllocTypeThreadData) itA.next();
! Iterator itM = a.getAllocTypeThreadMethods().iterator();
while (itM.hasNext()) {
! AllocTypeThreadMethodData m = (AllocTypeThreadMethodData)
itM.next();
! Iterator itT = m.getAllocTypeThreadTraces().iterator();
while (itT.hasNext()) {
! AllocTypeThreadTraceData t =
! (AllocTypeThreadTraceData) itT.next();
totalAllocThreadObjectTraces ++;
}
***************
*** 230,237 ****
totalAllocThreadObjects ++;
}
! Iterator itM = th.getAllocMethods().values().iterator();
while (itM.hasNext()) {
AllocThreadMethodData m = (AllocThreadMethodData) itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
AllocThreadTraceData t = (AllocThreadTraceData) itT.next();
--- 235,242 ----
totalAllocThreadObjects ++;
}
! Iterator itM = th.getAllocThreadMethods().iterator();
while (itM.hasNext()) {
AllocThreadMethodData m = (AllocThreadMethodData) itM.next();
! Iterator itT = m.getAllocThreadTraces().iterator();
while (itT.hasNext()) {
AllocThreadTraceData t = (AllocThreadTraceData) itT.next();
***************
*** 240,247 ****
totalAllocThreadMethods ++;
}
! itM = th.getCPUMethods().values().iterator();
while (itM.hasNext()) {
CPUThreadMethodData m = (CPUThreadMethodData) itM.next();
! Iterator itT = m.getTraces().values().iterator();
while (itT.hasNext()) {
CPUThreadTraceData t = (CPUThreadTraceData) itT.next();
--- 245,252 ----
totalAllocThreadMethods ++;
}
! itM = th.getCPUThreadMethods().iterator();
while (itM.hasNext()) {
CPUThreadMethodData m = (CPUThreadMethodData) itM.next();
! Iterator itT = m.getCPUThreadTraces().iterator();
while (itT.hasNext()) {
CPUThreadTraceData t = (CPUThreadTraceData) itT.next();
***************
*** 250,257 ****
totalCpuThreadMethods ++;
}
! itM = th.getMonMethods().values().iterator();
while (itM.hasNext()) {
MonThreadMethodData m = (MonThreadMethodData) itM.next();
! Iterator itT = m. getTraces().values().iterator();
while (itT.hasNext()) {
MonThreadTraceData t = (MonThreadTraceData) itT.next();
--- 255,262 ----
totalCpuThreadMethods ++;
}
! itM = th.getMonThreadMethods().iterator();
while (itM.hasNext()) {
MonThreadMethodData m = (MonThreadMethodData) itM.next();
! Iterator itT = m.getMonThreadTraces().iterator();
while (itT.hasNext()) {
MonThreadTraceData t = (MonThreadTraceData) itT.next();
***************
*** 296,299 ****
--- 301,307 ----
/*
* $Log$
+ * Revision 1.5 2002/09/07 19:38:23 vachis
+ * problems in compilation fixed
+ *
* Revision 1.4 2002/02/16 16:22:18 vachis
* code refacorization Class.. to Type... (forgotten methods)
|
|
From: Pavel V. <va...@us...> - 2002-09-07 09:57:06
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources In directory usw-pr-cvs1:/tmp/cvs-serv2482 Modified Files: DetachActionIcon.gif Log Message: De is on it Index: DetachActionIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/DetachActionIcon.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 Binary files /tmp/cvs5v9Mqt and /tmp/cvsazciLM differ |
|
From: Pavel V. <va...@us...> - 2002-09-06 19:16:54
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions In directory usw-pr-cvs1:/tmp/cvs-serv13775 Added Files: DetachAction.java Log Message: new detach action --- NEW FILE: DetachAction.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. */ package net.sourceforge.javaprofiler.module.actions; import javax.swing.Action; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.actions.CallableSystemAction; import net.sourceforge.javaprofiler.module.data.Session; import net.sourceforge.javaprofiler.module.data.ProfilerData; /** * Action that deteaches current session. * * @author Jan Stola, Pavel */ public class DetachAction extends CallableSystemAction { public void performAction () { ProfilerData data=ProfilerData.getData(); Session session=data.currentSession(); if (session!=null) { session.getVM().dispose(); data.removeSession(session); } } public String getName () { return NbBundle.getMessage(DetachAction.class, "LBL_detachAction"); } protected String iconResource () { return "/net/sourceforge/javaprofiler/module/resources/DetachActionIcon.gif"; } public HelpCtx getHelpCtx () { return new HelpCtx(DetachAction.class); } protected void initialize () { super.initialize(); putProperty(Action.SHORT_DESCRIPTION, NbBundle.getMessage(DetachAction.class, "HINT_detachAction")); } } /* * $Log: DetachAction.java,v $ * Revision 1.1 2002/09/06 19:16:51 vachis * new detach action * */ |
|
From: Pavel V. <va...@us...> - 2002-09-06 19:16:17
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions In directory usw-pr-cvs1:/tmp/cvs-serv13560 Modified Files: Bundle.properties Log Message: added detach action Index: Bundle.properties =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions/Bundle.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Bundle.properties 3 Sep 2002 17:50:46 -0000 1.8 --- Bundle.properties 6 Sep 2002 19:16:13 -0000 1.9 *************** *** 63,64 **** --- 63,72 ---- LBL_ShowTable=Show Table LBL_ShowHistogram=Show Histogram + + LBL_BTAction=Open Backtrace + + LBL_CTAction=Open Call Tree + + LBL_detachAction=Detach + + HINT_detachAction=Detaches from currently profiled session. |
|
From: Pavel V. <va...@us...> - 2002-09-06 19:15:52
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources
In directory usw-pr-cvs1:/tmp/cvs-serv13390
Modified Files:
mf-layer.xml
Log Message:
added detach action
Index: mf-layer.xml
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/mf-layer.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mf-layer.xml 16 May 2002 11:57:23 -0000 1.4
--- mf-layer.xml 6 Sep 2002 19:15:49 -0000 1.5
***************
*** 32,35 ****
--- 32,36 ----
<file name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
+ <file name="net-sourceforge-javaprofiler-module-actions-DetachAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-GCAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance" />
***************
*** 50,54 ****
<attr name="net-sourceforge-javaprofiler-module-actions-ListenAction.instance/net-sourceforge-javaprofiler-module-actions-FinishAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance/Separator1[javax-swing-JSeparator].instance" boolvalue="true" />
<file name="Separator1[javax-swing-JSeparator].instance"/>
--- 51,57 ----
<attr name="net-sourceforge-javaprofiler-module-actions-ListenAction.instance/net-sourceforge-javaprofiler-module-actions-FinishAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance/net-sourceforge-javaprofiler-module-actions-DetachAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-DetachAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-DetachAction.instance/Separator1[javax-swing-JSeparator].instance" boolvalue="true" />
<file name="Separator1[javax-swing-JSeparator].instance"/>
***************
*** 92,96 ****
<attr name="net-sourceforge-javaprofiler-module-actions-ListenAction.instance/net-sourceforge-javaprofiler-module-actions-FinishAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance/net-sourceforge-javaprofiler-module-actions-PauseAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance" />
<attr name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance/net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" boolvalue="true" />
--- 95,101 ----
<attr name="net-sourceforge-javaprofiler-module-actions-ListenAction.instance/net-sourceforge-javaprofiler-module-actions-FinishAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance/net-sourceforge-javaprofiler-module-actions-DetachAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-DetachAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-DetachAction.instance/net-sourceforge-javaprofiler-module-actions-PauseAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance" />
<attr name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance/net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" boolvalue="true" />
|
|
From: Pavel V. <va...@us...> - 2002-09-06 19:15:24
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources In directory usw-pr-cvs1:/tmp/cvs-serv13159 Added Files: DetachActionIcon.gif Log Message: new detach action icon (now looks like finish action :) ) --- NEW FILE: DetachActionIcon.gif --- GIF89a |
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv21133
Modified Files:
AllocThreadMethodData.java AllocThreadTraceData.java
AllocTraceData.java AllocTypeMethodData.java
AllocTypeThreadData.java AllocTypeThreadMethodData.java
AllocTypeThreadTraceData.java AllocTypeTraceData.java
CPUThreadMethodData.java CPUThreadTraceData.java
CPUTraceData.java FieldData.java FrameData.java GCRunData.java
MethodData.java MonThreadMethodData.java
MonThreadTraceData.java MonTraceData.java ThreadData.java
ThreadGroupData.java
Log Message:
added constructor
it's analogy of copy constructor
Index: AllocThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadMethodData.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** AllocThreadMethodData.java 24 Jul 2002 22:29:21 -0000 1.19
--- AllocThreadMethodData.java 6 Sep 2002 18:06:00 -0000 1.20
***************
*** 74,77 ****
--- 74,90 ----
setStat(sid.alloc);
}
+
+ /**
+ * Creates new AllocThreadMethodData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param thread allocation data for this thread.
+ * @param method allocation data for this method.
+ */
+ AllocThreadMethodData( AllocThreadMethodData source, ThreadData thread, MethodData method ) {
+ this( source.getID(), thread, method );
+
+ setStat( source );
+ }
/**
***************
*** 219,222 ****
--- 232,239 ----
/*
* $Log$
+ * Revision 1.20 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.19 2002/07/24 22:29:21 vachis
* implements new interfaces for getting roots and info
Index: AllocThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadTraceData.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** AllocThreadTraceData.java 24 Jul 2002 22:29:21 -0000 1.19
--- AllocThreadTraceData.java 6 Sep 2002 18:06:00 -0000 1.20
***************
*** 74,77 ****
--- 74,90 ----
/**
+ * Creates new AllocThreadTraceData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param threadMethod allocation data for this thread and method.
+ */
+ AllocThreadTraceData( AllocThreadTraceData source, AllocThreadMethodData threadMethod,
+ AllocTraceData trace ) {
+ this( source.getID(), threadMethod, trace );
+
+ setStat( source );
+ }
+
+ /**
* Adds type that was allocated in this given trace
* and thread. type can be instance of class or its array.
***************
*** 190,193 ****
--- 203,210 ----
/*
* $Log$
+ * Revision 1.20 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.19 2002/07/24 22:29:21 vachis
* implements new interfaces for getting roots and info
Index: AllocTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTraceData.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** AllocTraceData.java 31 Aug 2002 08:37:39 -0000 1.24
--- AllocTraceData.java 6 Sep 2002 18:06:00 -0000 1.25
***************
*** 63,67 ****
/**
! * Creates new AllocTraceData.
*
* @param sid data returned by communication layer
--- 63,67 ----
/**
! * Creates new AllocTraceData, anlogy of copy constructor.
*
* @param sid data returned by communication layer
***************
*** 78,81 ****
--- 78,96 ----
}
+ /**
+ * Creates new AllocTraceData.
+ *
+ * @param source copy data from this source
+ * @param method allocation data for this method.
+ * @param frames frames that make up this trace. It should be
+ * <code>List</code> of {@link FrameData} objects. Constructor takes this list,
+ * it doesn't make a copy of the list.
+ */
+ AllocTraceData( AllocTraceData source, MethodData method, List frames ) {
+ this( source.getID(), method, frames );
+
+ setStat( source );
+ }
+
/**
* Adds type that was allocated in this trace. Type
***************
*** 249,252 ****
--- 264,271 ----
/*
* $Log$
+ * Revision 1.25 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.24 2002/08/31 08:37:39 petrul
* fixed getMethod()
Index: AllocTypeMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeMethodData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocTypeMethodData.java 24 Jul 2002 22:29:22 -0000 1.9
--- AllocTypeMethodData.java 6 Sep 2002 18:06:00 -0000 1.10
***************
*** 76,79 ****
--- 76,92 ----
setStat(sid.alloc);
}
+
+ /**
+ * Creates new AllocTypeMethodData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param method allocation data for this method.
+ * @param type allocation data for this type.
+ */
+ AllocTypeMethodData( AllocTypeMethodData source, TypeData type, MethodData method ) {
+ this( source.getID(), type, method );
+
+ this.setStat( source );
+ }
/**
***************
*** 203,206 ****
--- 216,223 ----
/*
* $Log$
+ * Revision 1.10 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.9 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: AllocTypeThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeThreadData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeThreadData.java 12 Jun 2002 22:00:29 -0000 1.4
--- AllocTypeThreadData.java 6 Sep 2002 18:06:00 -0000 1.5
***************
*** 74,77 ****
--- 74,90 ----
setStat(sid.alloc);
}
+
+ /**
+ * Creates new AllocTypeThreadData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param thread allocation data for this thread.
+ * @param type allocation data for this type.
+ */
+ AllocTypeThreadData(AllocTypeThreadData source, ThreadData thread, TypeData type) {
+ this( source.getID() , thread, type );
+
+ setStat( source );
+ }
/**
***************
*** 196,199 ****
--- 209,216 ----
/*
* $Log$
+ * Revision 1.5 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.4 2002/06/12 22:00:29 vachis
* add/removeChildListeners - param String changed to int
Index: AllocTypeThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeThreadMethodData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** AllocTypeThreadMethodData.java 24 Jul 2002 22:29:22 -0000 1.5
--- AllocTypeThreadMethodData.java 6 Sep 2002 18:06:00 -0000 1.6
***************
*** 77,80 ****
--- 77,99 ----
setStat(sid.alloc);
}
+
+ /**
+ * Creates new AllocTypeThreadMethodData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param threadType allocation data for this type and thread.
+ * @param typeMethod allocation data for this type and method.
+ * @param threadMethod allocation data for this thread and method.
+ */
+ AllocTypeThreadMethodData(AllocTypeThreadMethodData source,
+ AllocTypeThreadData threadType,
+ AllocTypeMethodData typeMethod,
+ AllocThreadMethodData threadMethod)
+ {
+ this( source.getID(), threadType, typeMethod, threadMethod );
+
+ setStat( source );
+ }
+
/**
***************
*** 201,204 ****
--- 220,227 ----
/*
* $Log$
+ * Revision 1.6 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.5 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: AllocTypeThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeThreadTraceData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AllocTypeThreadTraceData.java 24 Jul 2002 22:29:22 -0000 1.3
--- AllocTypeThreadTraceData.java 6 Sep 2002 18:06:00 -0000 1.4
***************
*** 72,75 ****
--- 72,93 ----
}
+ /**
+ * Creates new AllocTypeThreadTraceData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param typeTrace allocation data for this type and trace.
+ * @param threadTypeMethod allocation data for this type, thread and method.
+ * @param threadTrace allocation data for this thread and trace.
+ */
+ AllocTypeThreadTraceData(AllocTypeThreadTraceData source,
+ AllocTypeTraceData classTrace,
+ AllocTypeThreadMethodData threadClassMethod,
+ AllocThreadTraceData threadTrace)
+ {
+ this( source.getID(), classTrace, threadClassMethod, threadTrace );
+
+ setStat( source );
+ }
+
// ---------- return parents
***************
*** 155,158 ****
--- 173,180 ----
/*
* $Log$
+ * Revision 1.4 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.3 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: AllocTypeTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeTraceData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocTypeTraceData.java 24 Jul 2002 22:29:22 -0000 1.9
--- AllocTypeTraceData.java 6 Sep 2002 18:06:00 -0000 1.10
***************
*** 74,77 ****
--- 74,91 ----
/**
+ * Creates new AllocTypeTraceData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param trace allocation data for this trace.
+ * @param typeMethod allocation data for this type and method.
+ */
+ AllocTypeTraceData( AllocTypeTraceData source, AllocTypeMethodData classMethod,
+ AllocTraceData trace) {
+ this( source.getID(), classMethod, trace );
+
+ setStat( source );
+ }
+
+ /**
* Adds thread where instances of this type (class or array of classes) were allocated in given trace.
*
***************
*** 169,172 ****
--- 183,190 ----
/*
* $Log$
+ * Revision 1.10 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.9 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: CPUThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUThreadMethodData.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** CPUThreadMethodData.java 24 Jul 2002 22:29:22 -0000 1.14
--- CPUThreadMethodData.java 6 Sep 2002 18:06:00 -0000 1.15
***************
*** 73,76 ****
--- 73,92 ----
/**
+ * Creates new CPUThreadMethodData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param thread profiling data for this thread.
+ * @param method profiling data for this method.
+ */
+ CPUThreadMethodData( CPUThreadMethodData source,
+ ThreadData thread,
+ MethodData method )
+ {
+ this( source.getID(), thread, method );
+
+ setStat( source );
+ }
+
+ /**
* Adds trace of this method.
*
***************
*** 174,177 ****
--- 190,197 ----
/*
* $Log$
+ * Revision 1.15 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.14 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: CPUThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUThreadTraceData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** CPUThreadTraceData.java 24 Jul 2002 22:29:22 -0000 1.10
--- CPUThreadTraceData.java 6 Sep 2002 18:06:00 -0000 1.11
***************
*** 65,68 ****
--- 65,84 ----
}
+ /**
+ * Creates new CPUThreadTraceData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param threadMethod profiling data for this thread and method.
+ * @param trace profiling data for this trace.
+ */
+ CPUThreadTraceData( CPUThreadTraceData source,
+ CPUThreadMethodData threadMethod,
+ CPUTraceData trace )
+ {
+ this( source.getID(), threadMethod, trace );
+
+ setStat( source );
+ }
+
// ---------- return parents, roots
***************
*** 133,136 ****
--- 149,156 ----
/*
* $Log$
+ * Revision 1.11 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.10 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: CPUTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUTraceData.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** CPUTraceData.java 31 Aug 2002 08:37:39 -0000 1.18
--- CPUTraceData.java 6 Sep 2002 18:06:00 -0000 1.19
***************
*** 77,80 ****
--- 77,96 ----
}
+ /**
+ * Creates new CPUTraceData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param method profiling data for this method.
+ * @param frames frames that make up this trace. It should be
+ * <code>List</code> of {@link FrameData} objects.
+ */
+ CPUTraceData( CPUTraceData source,
+ MethodData method, List frames )
+ {
+ this( source.getID(), method, frames );
+
+ setStat( source );
+ }
+
/**
* Adds thread in which this trace appeared.
***************
*** 207,210 ****
--- 223,230 ----
/*
* $Log$
+ * Revision 1.19 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.18 2002/08/31 08:37:39 petrul
* fixed getMethod()
Index: FieldData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/FieldData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FieldData.java 30 May 2002 22:38:17 -0000 1.2
--- FieldData.java 6 Sep 2002 18:06:00 -0000 1.3
***************
*** 59,62 ****
--- 59,76 ----
* Creates new ClassFieldData
*
+ * @param source copy data from this source
+ */
+ FieldData(FieldData source, ClassData parentClass) {
+ this( source.getID(),
+ source.getName(),
+ source.getSignature(),
+ parentClass,
+ source.isStatic()
+ );
+ }
+
+ /**
+ * Creates new ClassFieldData
+ *
* @param sid data returned by communication layer .
*/
***************
*** 113,116 ****
--- 127,134 ----
/*
* $Log$
+ * Revision 1.3 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.2 2002/05/30 22:38:17 vachis
* changed interface to jpi
Index: FrameData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/FrameData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** FrameData.java 23 Aug 2002 18:08:36 -0000 1.4
--- FrameData.java 6 Sep 2002 18:06:00 -0000 1.5
***************
*** 49,52 ****
--- 49,62 ----
}
+ /**
+ * Creates new FrameData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param method method of this frame.
+ */
+ FrameData(FrameData source, MethodData method, FrameData callerFrame) {
+ this( source.getLineNo(), method, callerFrame );
+ }
+
// -------------- info getter methods
***************
*** 124,127 ****
--- 134,141 ----
/*
* $Log$
+ * Revision 1.5 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.4 2002/08/23 18:08:36 petrul
* equals() method less restrictive
Index: GCRunData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/GCRunData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** GCRunData.java 11 Jun 2002 06:56:03 -0000 1.1
--- GCRunData.java 6 Sep 2002 18:06:00 -0000 1.2
***************
*** 73,76 ****
--- 73,91 ----
((IProf.sGCInfo)sid.info).endTime);
}
+
+ /**
+ * Creates new GCData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ */
+ GCRunData(GCRunData source) {
+ this( source.getID(),
+ source.getUsedObjectsCount(),
+ source.getUsedSpace(),
+ source.getTotalSpace(),
+ source.getStartTime(),
+ source.getEndTime()
+ );
+ }
/**
***************
*** 123,126 ****
--- 138,145 ----
/*
* $Log$
+ * Revision 1.2 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.1 2002/06/11 06:56:03 vachis
* GCData renamed
Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** MethodData.java 20 Aug 2002 19:30:01 -0000 1.21
--- MethodData.java 6 Sep 2002 18:06:00 -0000 1.22
***************
*** 119,122 ****
--- 119,141 ----
/**
+ * Creates new MethodData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param parentClass class this method belongs to.
+ * @param virtualMachineImage VirtualMachineImage this method belongs to. The VirtualMachineImage could be live
+ * (realtime implementation) or static (snaphshot).
+ */
+ MethodData( MethodData source, ClassData parentClass,
+ VirtualMachineImageRef vmImage) {
+ this( source.getID(), source.getName(),
+ source.getSignature(), source.getStartLineNo(), source.getEndLineNo(),
+ parentClass, vmImage);
+
+ setStat( (CPUStatData) source );
+ setStat( (MonStatData) source );
+ setStat( (AllocStatData) source );
+ }
+
+ /**
* Adds trace of this method where some objects were allocated.
*
***************
*** 418,421 ****
--- 437,444 ----
/*
* $Log$
+ * Revision 1.22 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.21 2002/08/20 19:30:01 petrul
* fixed toString method
Index: MonThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonThreadMethodData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** MonThreadMethodData.java 24 Jul 2002 22:29:22 -0000 1.11
--- MonThreadMethodData.java 6 Sep 2002 18:06:00 -0000 1.12
***************
*** 71,75 ****
//if (sid.mon!=null) //do not test this, its an error
setStat(sid.mon);
! }
/**
--- 71,91 ----
//if (sid.mon!=null) //do not test this, its an error
setStat(sid.mon);
! }
!
! /**
! * Creates new MonThreadMethodData, anlogy of copy constructor.
! *
! * @param source copy data from this source
! * @param thread profiling data for this thread.
! * @param method profiling data for this method.
! */
! MonThreadMethodData( MonThreadMethodData source,
! ThreadData thread,
! MethodData method )
! {
! this( source.getID(), thread, method );
!
! setStat( source );
! }
/**
***************
*** 175,178 ****
--- 191,198 ----
/*
* $Log$
+ * Revision 1.12 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.11 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: MonThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonThreadTraceData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** MonThreadTraceData.java 24 Jul 2002 22:29:22 -0000 1.8
--- MonThreadTraceData.java 6 Sep 2002 18:06:00 -0000 1.9
***************
*** 54,58 ****
/**
! * Creates new MonThreadTraceData.
*
* @param sid data returned by communication layer
--- 54,58 ----
/**
! * Creates new MonThreadTraceData, anlogy of copy constructor.
*
* @param sid data returned by communication layer
***************
*** 67,70 ****
--- 67,86 ----
setStat(sid.mon);
}
+
+ /**
+ * Creates new MonThreadTraceData.
+ *
+ * @param source copy data from this source
+ * @param threadMethod profiling data for this thread and method.
+ * @param trace profiling data for this trace.
+ */
+ MonThreadTraceData( MonThreadTraceData source,
+ MonThreadMethodData threadMethod,
+ MonTraceData trace )
+ {
+ this( source.getID(), threadMethod, trace );
+
+ setStat( source );
+ }
// ---------- return parents, roots
***************
*** 135,138 ****
--- 151,158 ----
/*
* $Log$
+ * Revision 1.9 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.8 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: MonTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonTraceData.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** MonTraceData.java 31 Aug 2002 08:37:39 -0000 1.16
--- MonTraceData.java 6 Sep 2002 18:06:00 -0000 1.17
***************
*** 75,78 ****
--- 75,90 ----
setStat(sid.mon);
}
+
+ /**
+ * Creates new MonTraceData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param method profiling data for this method.
+ */
+ MonTraceData( MonTraceData source, MethodData method, List frames ) {
+ this( source.getID(), method, frames );
+
+ setStat( source );
+ }
/**
***************
*** 209,212 ****
--- 221,228 ----
/*
* $Log$
+ * Revision 1.17 2002/09/06 18:06:00 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.16 2002/08/31 08:37:39 petrul
* fixed getMethod()
Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** ThreadData.java 24 Jul 2002 22:29:22 -0000 1.24
--- ThreadData.java 6 Sep 2002 18:06:01 -0000 1.25
***************
*** 112,115 ****
--- 112,137 ----
if (sid.alloc != null)
setStat(sid.alloc);
+
+ //PENDING compute CPU, MON stat from children
+ }
+
+ /**
+ * Creates new ThreadData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ * @param group group of this thread.
+ * @param parent parent of this thread.
+ * @param virtualMachineImage VirtualMachineImage this method belongs to. The VirtualMachineImage could be live
+ * (realtime implementation) or static (snaphshot).
+ */
+ ThreadData( ThreadData source, ThreadGroupData group, ThreadData parent,
+ VirtualMachineImageRef vmImage) {
+ this( source.getID(), source.getName(), group, parent, vmImage,
+ source.getStartTime(), source.getEndTime(), source.isActive()
+ );
+
+ setStat( (CPUStatData) source );
+ setStat( (MonStatData) source );
+ setStat( (AllocStatData) source );
}
***************
*** 534,537 ****
--- 556,563 ----
/*
* $Log$
+ * Revision 1.25 2002/09/06 18:06:01 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.24 2002/07/24 22:29:22 vachis
* implements new interfaces for getting roots and info
Index: ThreadGroupData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadGroupData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ThreadGroupData.java 12 Jun 2002 22:00:31 -0000 1.8
--- ThreadGroupData.java 6 Sep 2002 18:06:01 -0000 1.9
***************
*** 63,66 ****
--- 63,75 ----
/**
+ * Creates new ThreadGroupData, anlogy of copy constructor.
+ *
+ * @param source copy data from this source
+ */
+ ThreadGroupData( ThreadGroupData source ) {
+ this( source.getID(), source.getName() );
+ }
+
+ /**
* Adds thread into this group.
*
***************
*** 107,110 ****
--- 116,123 ----
/*
* $Log$
+ * Revision 1.9 2002/09/06 18:06:01 vachis
+ * added constructor
+ * it's analogy of copy constructor
+ *
* Revision 1.8 2002/06/12 22:00:31 vachis
* add/removeChildListeners - param String changed to int
|
|
From: Michal P. <mic...@us...> - 2002-09-05 14:06:45
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views
In directory usw-pr-cvs1:/tmp/cvs-serv17026/net/sourceforge/javaprofiler/module/views
Modified Files:
AllocHistogramTable.java
Log Message:
Removed compilation ambiguities.
Index: AllocHistogramTable.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/AllocHistogramTable.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocHistogramTable.java 19 Aug 2002 09:07:20 -0000 1.10
--- AllocHistogramTable.java 5 Sep 2002 14:06:42 -0000 1.11
***************
*** 130,183 ****
public LongStringRenderer() {
super();
! setOpaque( true );
! setBorder(noFocusBorder);
!
//setHorizontalAlignment( RIGHT );
}
public Component getTableCellRendererComponent(
! JTable table, Object astr, boolean isSelected,
! boolean hasFocus, int row, int column)
{
String str = (String) astr;
if (isSelected) {
! setForeground(table.getSelectionForeground());
! setBackground(table.getSelectionBackground());
}
else {
! setForeground(table.getForeground());
! setBackground(table.getBackground());
}
!
if (hasFocus) {
! setBorder( UIManager.getBorder("Table.focusCellHighlightBorder") );
if (table.isCellEditable(row, column)) {
super.setForeground( UIManager.getColor("Table.focusCellForeground") );
super.setBackground( UIManager.getColor("Table.focusCellBackground") );
}
! }
else {
! setBorder(noFocusBorder);
}
!
//setFont(table.getFont());
! if (font == null) {
font = table.getFont().deriveFont( Font.BOLD );
! setFont( font );
}
!
setText( str );
!
! if ( getPreferredSize().width >= getColumnModel().getColumn(column).getWidth() )
//if ( str.length() > 50 )
! setToolTipText( str );
else
! setToolTipText( null );
!
return this;
}
}
!
//renderer of histogram bars //PENDING all
--- 130,183 ----
public LongStringRenderer() {
super();
! this.setOpaque( true );
! this.setBorder(noFocusBorder);
!
//setHorizontalAlignment( RIGHT );
}
public Component getTableCellRendererComponent(
! JTable table, Object astr, boolean isSelected,
! boolean hasFocus, int row, int column)
{
String str = (String) astr;
if (isSelected) {
! this.setForeground(table.getSelectionForeground());
! this.setBackground(table.getSelectionBackground());
}
else {
! this.setForeground(table.getForeground());
! this.setBackground(table.getBackground());
}
!
if (hasFocus) {
! this.setBorder( UIManager.getBorder("Table.focusCellHighlightBorder") );
if (table.isCellEditable(row, column)) {
super.setForeground( UIManager.getColor("Table.focusCellForeground") );
super.setBackground( UIManager.getColor("Table.focusCellBackground") );
}
! }
else {
! this.setBorder(noFocusBorder);
}
!
//setFont(table.getFont());
! if (font == null) {
font = table.getFont().deriveFont( Font.BOLD );
! this.setFont( font );
}
!
setText( str );
!
! if ( this.getPreferredSize().width >= getColumnModel().getColumn(column).getWidth() )
//if ( str.length() > 50 )
! this.setToolTipText( str );
else
! this.setToolTipText( null );
!
return this;
}
}
!
//renderer of histogram bars //PENDING all
***************
*** 186,190 ****
Border selectedBorder = null;
boolean isBordered = true;
!
JProgressBar bar;
long barMax = 1000;
--- 186,190 ----
Border selectedBorder = null;
boolean isBordered = true;
!
JProgressBar bar;
long barMax = 1000;
***************
*** 200,221 ****
public Component getTableCellRendererComponent(
! JTable table, Object allocObj, boolean isSelected,
boolean hasFocus, int row, int column) {
AllocStat alloc = (AllocStat) allocObj;
bar.setMaximum( 100 ); //percent
!
while( barMax < alloc.getLiveInstancesCount() ) {
barMax = barMax * 2;
!
! repaint();
}
!
bar.setValue( (int) ((100*alloc.getLiveInstancesCount())/barMax) );
!
//??
if ( bar.getValue() < 1 && alloc.getLiveInstancesCount() > 0) {
bar.setValue(1);
}
!
if (isBordered) {
if (isSelected) {
--- 200,221 ----
public Component getTableCellRendererComponent(
! JTable table, Object allocObj, boolean isSelected,
boolean hasFocus, int row, int column) {
AllocStat alloc = (AllocStat) allocObj;
bar.setMaximum( 100 ); //percent
!
while( barMax < alloc.getLiveInstancesCount() ) {
barMax = barMax * 2;
!
! this.repaint();
}
!
bar.setValue( (int) ((100*alloc.getLiveInstancesCount())/barMax) );
!
//??
if ( bar.getValue() < 1 && alloc.getLiveInstancesCount() > 0) {
bar.setValue(1);
}
!
if (isBordered) {
if (isSelected) {
***************
*** 224,228 ****
table.getSelectionBackground());
}
! setBorder(selectedBorder);
} else {
if (unselectedBorder == null) {
--- 224,228 ----
table.getSelectionBackground());
}
! this.setBorder(selectedBorder);
} else {
if (unselectedBorder == null) {
***************
*** 230,234 ****
table.getBackground());
}
! setBorder(unselectedBorder);
}
}
--- 230,234 ----
table.getBackground());
}
! this.setBorder(unselectedBorder);
}
}
***************
*** 253,256 ****
--- 253,260 ----
/*
* $Log$
+ * Revision 1.11 2002/09/05 14:06:42 michalpise
+ *
+ * Removed compilation ambiguities.
+ *
* Revision 1.10 2002/08/19 09:07:20 vachis
* added loggin of changes
|
|
From: Michal P. <mic...@us...> - 2002-09-05 14:03:05
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/wizards In directory usw-pr-cvs1:/tmp/cvs-serv15787/wizards Log Message: Directory /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/wizards added to the repository |
|
From: Michal P. <mic...@us...> - 2002-09-05 14:02:17
|
Update of /cvsroot/javaprofiler/module
In directory usw-pr-cvs1:/tmp/cvs-serv15490
Modified Files:
build.xml
Log Message:
Updated to include rescources in jar file.
Index: build.xml
===================================================================
RCS file: /cvsroot/javaprofiler/module/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** build.xml 21 Aug 2002 12:42:40 -0000 1.1
--- build.xml 5 Sep 2002 14:02:13 -0000 1.2
***************
*** 29,32 ****
--- 29,33 ----
<fileset dir=".">
<include name="**/*.properties"/>
+ <include name="net/sourceforge/javaprofiler/module/resources/*"/>
</fileset>
</jar>
|
|
From: Michal P. <mic...@us...> - 2002-09-05 13:58:17
|
Update of /cvsroot/javaprofiler/patches
In directory usw-pr-cvs1:/tmp/cvs-serv14075
Modified Files:
build.xml
Log Message:
Minor changes.
Index: build.xml
===================================================================
RCS file: /cvsroot/javaprofiler/patches/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** build.xml 21 Aug 2002 11:22:10 -0000 1.1
--- build.xml 5 Sep 2002 13:58:12 -0000 1.2
***************
*** 6,9 ****
--- 6,10 ----
<property name="doxygen" location="/usr/bin/doxygen"/>
<property name="NBDir" location="/usr/java/NetBeans3.3.2"/>
+ <property name="NBUserDIr" location="/home/pi/nbuser33"/>
<!-- end of configuration ******************************************* -->
***************
*** 43,49 ****
<target name="install" depends="init,jar" description="Install jar archives">
! <copy file="output/openide-javaprof.jar" todir="${NBDir}/lib/patches"/>
! <mkdir dir="${NBDir}/modules/patches/org-netbeans-modules-java"/>
! <copy file="output/java-javaprof.jar" todir="${NBDir}/modules/patches/org-netbeans-modules-java"/>
</target>
--- 44,50 ----
<target name="install" depends="init,jar" description="Install jar archives">
! <copy file="output/openide-javaprof.jar" todir="${NBUserDir}/lib/patches"/>
! <mkdir dir="${NBUserDir}/modules/patches/org-netbeans-modules-java"/>
! <copy file="output/java-javaprof.jar" todir="${NBUserDir}/modules/patches/org-netbeans-modules-java"/>
</target>
***************
*** 86,91 ****
<target name="clean_install" description="Delete installed files">
! <delete file="${NBDir}/lib/patches/openide-javaprof.jar"/>
! <delete dir="${NBDir}/modules/patches/org-netbeans-modules-java"/>
</target>
</project>
--- 87,92 ----
<target name="clean_install" description="Delete installed files">
! <delete file="${NBUserDir}/lib/patches/openide-javaprof.jar"/>
! <delete dir="${NBUserDir}/modules/patches/org-netbeans-modules-java"/>
</target>
</project>
|
|
From: Michal P. <mic...@us...> - 2002-09-05 13:56:08
|
Update of /cvsroot/javaprofiler/build In directory usw-pr-cvs1:/tmp/cvs-serv13416 Modified Files: readme.txt TODO.txt Log Message: Minor changes. Index: readme.txt =================================================================== RCS file: /cvsroot/javaprofiler/build/readme.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** readme.txt 21 Aug 2002 13:49:14 -0000 1.1.1.1 --- readme.txt 5 Sep 2002 13:56:04 -0000 1.2 *************** *** 13,17 **** classes - compiles all Java sources jar - creates jar archives - nbm - creates NetBeans module install - installs module into proper NetBeans directories javadoc - generates Javadoc documentation --- 13,16 ---- Index: TODO.txt =================================================================== RCS file: /cvsroot/javaprofiler/build/TODO.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** TODO.txt 21 Aug 2002 13:49:14 -0000 1.1.1.1 --- TODO.txt 5 Sep 2002 13:56:04 -0000 1.2 *************** *** 1,8 **** Major: - creation of nbm file compilation of profiler library - installation of nbm file and patches Minor: ! javadoc of module ! javadoc of org.netbeans.modules.java --- 1,6 ---- Major: compilation of profiler library Minor: ! javadoc of module lasts VERY VERY long time (forever?) ! javadoc of org.netbeans.modules.java doesn't work (bug in javadoc?) |
|
From: Michal P. <mic...@us...> - 2002-09-05 13:53:34
|
Update of /cvsroot/javaprofiler/build
In directory usw-pr-cvs1:/tmp/cvs-serv12597
Modified Files:
build.xml
Log Message:
Updated to include module resources.
Index: build.xml
===================================================================
RCS file: /cvsroot/javaprofiler/build/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** build.xml 21 Aug 2002 13:49:14 -0000 1.1.1.1
--- build.xml 5 Sep 2002 13:53:29 -0000 1.2
***************
*** 6,9 ****
--- 6,10 ----
<property name="doxygen" location="/usr/bin/doxygen"/>
<property name="NBDir" location="/usr/java/NetBeans3.3.2"/>
+ <property name="NBUserDir" location="/home/pi/nbuser33"/>
<property name="jpidir" location="../jpi"/>
***************
*** 36,49 ****
<fileset dir="${moduledir}">
<include name="**/*.properties"/>
</fileset>
</jar>
</target>
! <target name="nbm" depends="init,jar" description="Install jar archives">
! <fail message="Target nbm is not written yet."/>
! </target>
!
! <target name="install" depends="init,nbm" description="Install jar archives">
! <fail message="Target install is not written yet."/>
</target>
--- 37,48 ----
<fileset dir="${moduledir}">
<include name="**/*.properties"/>
+ <include name="net/sourceforge/javaprofiler/module/resources/*"/>
</fileset>
</jar>
</target>
! <target name="install" depends="init,jar" description="Install jar archives">
! <ant dir="${patchesdir}" target="install"/>
! <copy file="output/${ant.project.name}.jar" todir="${NBUserDir}/modules"/>
</target>
***************
*** 99,103 ****
<target name="clean_install" description="Delete installed files">
! <fail message="Target clean_install is not written yet."/>
</target>
--- 98,103 ----
<target name="clean_install" description="Delete installed files">
! <ant dir="${patchesdir}" target="clean_install"/>
! <delete file="output/${ant.project.name}.jar"/>
</target>
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:57:25
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes In directory usw-pr-cvs1:/tmp/cvs-serv18521 Removed Files: SnapshotNode.java Log Message: replaced with SnapshotNode2 --- SnapshotNode.java DELETED --- |
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:56:18
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions In directory usw-pr-cvs1:/tmp/cvs-serv18132 Removed Files: OpenCallTree.java OpenBacktrace.java Log Message: is not used --- OpenCallTree.java DELETED --- --- OpenBacktrace.java DELETED --- |
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:55:06
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets
In directory usw-pr-cvs1:/tmp/cvs-serv17624
Modified Files:
BacktraceItemSheet.java CallTreeItemSheet.java ClassSheet.java
FieldSheet.java MethodSheet.java PSelectorSheet.java
SheetFactory.java ThreadgroupSheet.java ThreadSheet.java
TraceSheet.java TypeSheet.java
Log Message:
updated javadoc
Index: BacktraceItemSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/BacktraceItemSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BacktraceItemSheet.java 28 Aug 2002 18:06:27 -0000 1.1
--- BacktraceItemSheet.java 3 Sep 2002 17:54:59 -0000 1.2
***************
*** 47,51 ****
import net.sourceforge.javaprofiler.jpi.CPUStat;
! /** Serves for creation of PropertySheet for call backtrace item.
* @author Lukas Petru
*/
--- 47,53 ----
import net.sourceforge.javaprofiler.jpi.CPUStat;
! /** This is a property sheet factory for Merg Trace item objects. It is
! * constructed for a key <code>FrameRef</code> and a list of child Merg Traces.
! * It shows properties of the Frame and CPU stats.
* @author Lukas Petru
*/
***************
*** 104,107 ****
--- 106,112 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:54:59 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:27 petrul
* property sheets for nodes ver 2
Index: CallTreeItemSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/CallTreeItemSheet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CallTreeItemSheet.java 31 Aug 2002 08:46:02 -0000 1.2
--- CallTreeItemSheet.java 3 Sep 2002 17:54:59 -0000 1.3
***************
*** 46,50 ****
import net.sourceforge.javaprofiler.jpi.CallTreeRef;
! /** Serves for creation of PropertySheet for call tree item.
* @author Lukas Petru
*/
--- 46,52 ----
import net.sourceforge.javaprofiler.jpi.CallTreeRef;
! /** This is a property sheet factory for Calltree item objects. It is
! * constructed for a <code>CallTreeRef</code>.
! * It shows properties of the Frame and CPU stats.
* @author Lukas Petru
*/
***************
*** 103,106 ****
--- 105,111 ----
/*
* $Log$
+ * Revision 1.3 2002/09/03 17:54:59 petrul
+ * updated javadoc
+ *
* Revision 1.2 2002/08/31 08:46:02 petrul
* added Class property
Index: ClassSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/ClassSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ClassSheet.java 28 Aug 2002 18:06:27 -0000 1.1
--- ClassSheet.java 3 Sep 2002 17:54:59 -0000 1.2
***************
*** 45,48 ****
--- 45,53 ----
import net.sourceforge.javaprofiler.jpi.ClassRef;
+ /** This is a property sheet factory for Class objects. It is
+ * constructed for a <code>ClassRef</code>.
+ * It shows properties of the class.
+ * @author Lukas Petru
+ */
public class ClassSheet implements SheetFactory {
private ClassRef ref;
***************
*** 79,82 ****
--- 84,90 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:54:59 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:27 petrul
* property sheets for nodes ver 2
Index: FieldSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/FieldSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FieldSheet.java 28 Aug 2002 18:06:27 -0000 1.1
--- FieldSheet.java 3 Sep 2002 17:54:59 -0000 1.2
***************
*** 45,48 ****
--- 45,53 ----
import net.sourceforge.javaprofiler.jpi.FieldRef;
+ /** This is a property sheet factory for Field objects. It is constructed for a
+ * <code>FieldRef</code>.
+ * It shows properties of the field.
+ * @author Lukas Petru
+ */
public class FieldSheet implements SheetFactory {
private FieldRef ref;
***************
*** 91,94 ****
--- 96,102 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:54:59 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:27 petrul
* property sheets for nodes ver 2
Index: MethodSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/MethodSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MethodSheet.java 28 Aug 2002 18:06:27 -0000 1.1
--- MethodSheet.java 3 Sep 2002 17:54:59 -0000 1.2
***************
*** 45,48 ****
--- 45,53 ----
import net.sourceforge.javaprofiler.jpi.MethodRef;
+ /** This is a property sheet factory for Method objects. It is constructed for a
+ * <code>MethodRef</code>.
+ * It shows properties of the method, Alloc, CPU and Mon stats.
+ * @author Lukas Petru
+ */
public class MethodSheet implements SheetFactory {
private MethodRef ref;
***************
*** 101,104 ****
--- 106,112 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:54:59 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:27 petrul
* property sheets for nodes ver 2
Index: PSelectorSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/PSelectorSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PSelectorSheet.java 31 Aug 2002 08:47:05 -0000 1.1
--- PSelectorSheet.java 3 Sep 2002 17:54:59 -0000 1.2
***************
*** 47,50 ****
--- 47,55 ----
import java.beans.PropertyEditorSupport;
+ /** This is a property sheet factory for PSelectorNode. It gets a <code>
+ * PDataChildren</code> and child type in constructor.
+ * It shows the children sort mode property.
+ * @author Lukas Petru
+ */
public class PSelectorSheet implements SheetFactory {
private final PDataChildren children;
***************
*** 83,88 ****
}
class DataSortEditor extends PropertyEditorSupport {
! private static String[] texts={"(unsorted)", "Name", "Alloc", "CPU", "Mon"};
private final int type;
--- 88,99 ----
}
+ /** This editor enables to choose a sort mode for children of some
+ * PSelectorNode. It gets a child type in a constructor and offers only sort
+ * modes adequate for that child type.
+ * @author Lukas Petru
+ */
class DataSortEditor extends PropertyEditorSupport {
! private static String[] texts={"(unsorted)", "Name", "Alloc Live",
! "Alloc Total", "CPU", "Mon"};
private final int type;
***************
*** 110,119 ****
res[i++]=texts[0];
res[i++]=texts[1];
! if (InterfaceRepository.hasAlloc(type))
res[i++]=texts[2];
- if (InterfaceRepository.hasCPU(type))
res[i++]=texts[3];
! if (InterfaceRepository.hasMon(type))
res[i++]=texts[4];
String[] res2=new String[i];
System.arraycopy(res, 0, res2, 0, i);
--- 121,132 ----
res[i++]=texts[0];
res[i++]=texts[1];
! if (InterfaceRepository.hasAlloc(type)) {
res[i++]=texts[2];
res[i++]=texts[3];
! }
! if (InterfaceRepository.hasCPU(type))
res[i++]=texts[4];
+ if (InterfaceRepository.hasMon(type))
+ res[i++]=texts[5];
String[] res2=new String[i];
System.arraycopy(res, 0, res2, 0, i);
***************
*** 124,127 ****
--- 137,143 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:54:59 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/31 08:47:05 petrul
* 'Sort by' property
Index: SheetFactory.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/SheetFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SheetFactory.java 28 Aug 2002 18:06:28 -0000 1.1
--- SheetFactory.java 3 Sep 2002 17:54:59 -0000 1.2
***************
*** 42,45 ****
--- 42,48 ----
*/
public interface SheetFactory {
+
+ /** New property sheet is created and returned when this method is called.
+ */
public Sheet create();
}
***************
*** 47,50 ****
--- 50,56 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:54:59 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:28 petrul
* property sheets for nodes ver 2
Index: ThreadgroupSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/ThreadgroupSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ThreadgroupSheet.java 28 Aug 2002 18:06:28 -0000 1.1
--- ThreadgroupSheet.java 3 Sep 2002 17:55:00 -0000 1.2
***************
*** 46,49 ****
--- 46,54 ----
import net.sourceforge.javaprofiler.jpi.ThreadGroupRef;
+ /** This is a property sheet factory for Threadgroup objects. It is constructed
+ * for a <code>ThreadGroupRef</code>.
+ * It shows properties of the thread group.
+ * @author Lukas Petru
+ */
public class ThreadgroupSheet implements SheetFactory {
private ThreadGroupRef ref;
***************
*** 74,77 ****
--- 79,85 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:55:00 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:28 petrul
* property sheets for nodes ver 2
Index: ThreadSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/ThreadSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ThreadSheet.java 28 Aug 2002 18:06:28 -0000 1.1
--- ThreadSheet.java 3 Sep 2002 17:55:00 -0000 1.2
***************
*** 46,49 ****
--- 46,54 ----
import net.sourceforge.javaprofiler.jpi.ThreadRef;
+ /** This is a property sheet factory for Thread objects. It is constructed
+ * for a <code>ThreadRef</code>.
+ * It shows properties of the thread and alloc stats.
+ * @author Lukas Petru
+ */
public class ThreadSheet implements SheetFactory {
private ThreadRef ref;
***************
*** 69,76 ****
String.class, "getName", null);
} else {
! pr=new PropertySupport.ReadOnly("", String.class, "", "") {
! public Object getValue() throws IllegalAccessException,
! InvocationTargetException {return "null";}
! };
}
pr.setName("ParentThread");
--- 74,79 ----
String.class, "getName", null);
} else {
! pr=new PropertySupport.Reflection(this,
! String.class, "none", null);
}
pr.setName("ParentThread");
***************
*** 98,105 ****
--- 101,115 ----
return sh;
}
+
+ public String none() {
+ return "(none)";
+ }
}
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:55:00 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:28 petrul
* property sheets for nodes ver 2
Index: TraceSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/TraceSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TraceSheet.java 31 Aug 2002 08:47:36 -0000 1.1
--- TraceSheet.java 3 Sep 2002 17:55:00 -0000 1.2
***************
*** 49,52 ****
--- 49,58 ----
import net.sourceforge.javaprofiler.module.nodes.*;
+ /** This is a property sheet factory for Trace objects. It is constructed
+ * for a <code>TraceRef</code>.
+ * It shows properties of the trace and according to the actual type of the
+ * object it shows alloc, CPU or mon stats.
+ * @author Lukas Petru
+ */
public class TraceSheet implements SheetFactory {
private final TraceRef ref;
***************
*** 96,99 ****
--- 102,108 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:55:00 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/31 08:47:36 petrul
* added Frames property
Index: TypeSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/TypeSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TypeSheet.java 28 Aug 2002 18:06:28 -0000 1.1
--- TypeSheet.java 3 Sep 2002 17:55:00 -0000 1.2
***************
*** 45,48 ****
--- 45,53 ----
import net.sourceforge.javaprofiler.jpi.TypeRef;
+ /** This is a property sheet factory for Type objects. It is constructed
+ * for a <code>TypeRef</code>.
+ * It shows properties of the type and alloc stats.
+ * @author Lukas Petru
+ */
public class TypeSheet implements SheetFactory {
private TypeRef ref;
***************
*** 68,75 ****
String.class, "toString", null);
} else {
! pr=new PropertySupport.ReadOnly("", String.class, "", "") {
! public Object getValue() throws IllegalAccessException,
! InvocationTargetException {return "null";}
! };
}
pr.setName("ComponentClass");
--- 73,78 ----
String.class, "toString", null);
} else {
! pr=new PropertySupport.Reflection(this,
! String.class, "none", null);
}
pr.setName("ComponentClass");
***************
*** 96,103 ****
--- 99,113 ----
return sh;
}
+
+ public String none() {
+ return "N/A";
+ }
}
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:55:00 petrul
+ * updated javadoc
+ *
* Revision 1.1 2002/08/28 18:06:28 petrul
* property sheets for nodes ver 2
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:54:25
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets
In directory usw-pr-cvs1:/tmp/cvs-serv17420
Modified Files:
MultiRootSheet.java
Log Message:
added special sets for parents
Index: MultiRootSheet.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/sheets/MultiRootSheet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MultiRootSheet.java 31 Aug 2002 08:46:34 -0000 1.1
--- MultiRootSheet.java 3 Sep 2002 17:54:17 -0000 1.2
***************
*** 46,51 ****
--- 46,62 ----
import net.sourceforge.javaprofiler.jpi.CPUStat;
import net.sourceforge.javaprofiler.jpi.MonStat;
+ import net.sourceforge.javaprofiler.jpi.HasThreadRoot;
+ import net.sourceforge.javaprofiler.jpi.HasTypeRoot;
+ import net.sourceforge.javaprofiler.jpi.HasLocationRoot;
+ import net.sourceforge.javaprofiler.jpi.TraceRef;
+ import net.sourceforge.javaprofiler.jpi.LocationRef;
import net.sourceforge.javaprofiler.module.nodes.*;
+ /** This is a property sheet factory for multi rooted objects. Object given in
+ * constructor may be of type <code>CPUThreadTrace</code>, <code>MonThreadTrace
+ * </code> or <code>AllocTypeTrace</code>. The sheet contains one set of
+ * object's own properties and one set for every of its roots.
+ * @author Lukas Petru
+ */
public class MultiRootSheet implements SheetFactory {
private final Object ref;
***************
*** 58,63 ****
ResourceBundle bundle=NbBundle.getBundle(getClass());
Sheet sh=new Sheet();
- Sheet.Set set=Sheet.createPropertiesSet();
try {
Node.Property pr;
--- 69,75 ----
ResourceBundle bundle=NbBundle.getBundle(getClass());
Sheet sh=new Sheet();
+ // properties
+ Sheet.Set set=Sheet.createPropertiesSet();
try {
Node.Property pr;
***************
*** 67,71 ****
pr.setDisplayName(bundle.getString("LBL_Description"));
set.put(pr);
-
if (ref instanceof AllocStat)
AllocStatProperty.addProperties(set, (AllocStat) ref);
--- 79,82 ----
***************
*** 78,81 ****
--- 89,125 ----
}
sh.put(set);
+
+ // thread
+ if (ref instanceof HasThreadRoot) {
+ HasThreadRoot rooted=(HasThreadRoot) ref;
+ Sheet parentSheet=new ThreadSheet(rooted.getThread()).create();
+ set=parentSheet.get(Sheet.PROPERTIES);
+ set.setName("thread");
+ set.setDisplayName("Thread");
+ sh.put(set);
+ }
+
+ // type
+ if (ref instanceof HasTypeRoot) {
+ HasTypeRoot rooted=(HasTypeRoot) ref;
+ Sheet parentSheet=new TypeSheet(rooted.getType()).create();
+ set=parentSheet.get(Sheet.PROPERTIES);
+ set.setName("type");
+ set.setDisplayName("Type");
+ sh.put(set);
+ }
+
+ // trace
+ if (ref instanceof HasLocationRoot) {
+ LocationRef location=((HasLocationRoot) ref).getLocation();
+ if (location instanceof TraceRef) {
+ Sheet parentSheet=new TraceSheet((TraceRef) location).create();
+ set=parentSheet.get(Sheet.PROPERTIES);
+ set.setName("trace");
+ set.setDisplayName("Trace");
+ sh.put(set);
+ }
+ }
+
return sh;
}
***************
*** 84,87 ****
--- 128,134 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:54:17 petrul
+ * added special sets for parents
+ *
* Revision 1.1 2002/08/31 08:46:34 petrul
* automatically adds Alloc/CPU/Mon
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:53:36
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources In directory usw-pr-cvs1:/tmp/cvs-serv17146 Added Files: PDataIcon.gif Log Message: icon --- NEW FILE: PDataIcon.gif --- GIF89a |
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:52:44
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv16754
Modified Files:
SnapshotNode2.java
Log Message:
fixed: was refering SnapshotNode
Index: SnapshotNode2.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/SnapshotNode2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SnapshotNode2.java 28 Aug 2002 18:02:38 -0000 1.1
--- SnapshotNode2.java 3 Sep 2002 17:52:41 -0000 1.2
***************
*** 51,55 ****
public class SnapshotNode2 extends AbstractNode implements SnapshotCookie {
private Snapshot snapshot;
! private static ResourceBundle bundle=NbBundle.getBundle(SnapshotNode.class);
public SnapshotNode2(Snapshot snapshot) {
--- 51,56 ----
public class SnapshotNode2 extends AbstractNode implements SnapshotCookie {
private Snapshot snapshot;
! private static ResourceBundle bundle=NbBundle.getBundle(SnapshotNode2.class
! );
public SnapshotNode2(Snapshot snapshot) {
***************
*** 58,62 ****
setIconBase("/net/sourceforge/javaprofiler/module/resources/SnapshotNodeIcon");
setDisplayName(snapshot.getName());
! setShortDescription(NbBundle.getMessage(SnapshotNode.class, "HINT_snapshotNode"));
getCookieSet().add(this);
}
--- 59,63 ----
setIconBase("/net/sourceforge/javaprofiler/module/resources/SnapshotNodeIcon");
setDisplayName(snapshot.getName());
! setShortDescription(NbBundle.getMessage(SnapshotNode2.class, "HINT_snapshotNode"));
getCookieSet().add(this);
}
***************
*** 79,83 ****
public HelpCtx getHelpCtx() {
! return new HelpCtx(SnapshotNode.class);
}
--- 80,84 ----
public HelpCtx getHelpCtx() {
! return new HelpCtx(getClass());
}
***************
*** 166,181 ****
dialog.setVisible(true);
}
-
- /** Tells if this snapshot was created with call-tree information. For use
- * by the OpenCallTree action.
- */
- public boolean isCallTreeEnabled() {
- //PENDING
- return true;
- }
}
/*
* $Log$
* Revision 1.1 2002/08/28 18:02:38 petrul
* nodes, version 2
--- 167,177 ----
dialog.setVisible(true);
}
}
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:52:41 petrul
+ * fixed: was refering SnapshotNode
+ *
* Revision 1.1 2002/08/28 18:02:38 petrul
* nodes, version 2
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:52:31
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv16683
Modified Files:
PSelectorNode.java
Log Message:
added Show Histogram action
Index: PSelectorNode.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/PSelectorNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PSelectorNode.java 31 Aug 2002 08:44:17 -0000 1.1
--- PSelectorNode.java 3 Sep 2002 17:52:28 -0000 1.2
***************
*** 43,46 ****
--- 43,48 ----
import net.sourceforge.javaprofiler.module.sheets.SheetFactory;
import net.sourceforge.javaprofiler.module.actions.ShowTable;
+ import net.sourceforge.javaprofiler.module.actions.ShowHistogram;
+ import net.sourceforge.javaprofiler.jpi.Constants;
***************
*** 74,81 ****
protected SystemAction[] createActions() {
! return new SystemAction[] {
! SystemAction.get(ShowTable.class),
! SystemAction.get(PropertiesAction.class)
! };
}
--- 76,86 ----
protected SystemAction[] createActions() {
! SystemAction[] actions=new SystemAction[3];
! int i=0;
! if (type==Constants.TYPE)
! actions[i++]=SystemAction.get(ShowHistogram.class);
! actions[i++]=SystemAction.get(ShowTable.class);
! actions[i++]=SystemAction.get(PropertiesAction.class);
! return actions;
}
***************
*** 87,90 ****
--- 92,98 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:52:28 petrul
+ * added Show Histogram action
+ *
* Revision 1.1 2002/08/31 08:44:17 petrul
* added context action Show Table
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:52:22
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv16622
Modified Files:
PSelectorChildren.java
Log Message:
initial sorting of Nodes
Index: PSelectorChildren.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/PSelectorChildren.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PSelectorChildren.java 31 Aug 2002 08:43:42 -0000 1.2
--- PSelectorChildren.java 3 Sep 2002 17:52:19 -0000 1.3
***************
*** 76,79 ****
--- 76,81 ----
} else {
PDataChildren pChildren=new PDataChildren(childrenList);
+ pChildren.setSortMode(InterfaceRepository.getDefaultSort(
+ childTypes[i]));
children=pChildren;
if (InterfaceRepository.canSort(childTypes[i]))
***************
*** 139,142 ****
--- 141,147 ----
/*
* $Log$
+ * Revision 1.3 2002/09/03 17:52:19 petrul
+ * initial sorting of Nodes
+ *
* Revision 1.2 2002/08/31 08:43:42 petrul
* added 'Sort by' property
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:52:12
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv16548
Modified Files:
PDataChildren.java
Log Message:
icon changed
Index: PDataChildren.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/PDataChildren.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PDataChildren.java 31 Aug 2002 08:42:39 -0000 1.2
--- PDataChildren.java 3 Sep 2002 17:52:08 -0000 1.3
***************
*** 80,84 ****
new ThreadSheet(oo), oo);
node.setDisplayName(oo.getName());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 80,85 ----
new ThreadSheet(oo), oo);
node.setDisplayName(oo.getName());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 88,92 ****
new TraceSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 89,94 ----
new TraceSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 96,100 ****
oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 98,103 ----
oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 104,108 ****
new TraceSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 107,112 ----
new TraceSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 112,116 ****
oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 116,121 ----
oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 120,124 ****
new TypeSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 125,130 ----
new TypeSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 128,132 ****
new TraceSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 134,139 ----
new TraceSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 136,140 ****
oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 143,148 ----
oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 143,147 ****
AbstractNode node=new AbstractNode(Children.LEAF);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 151,156 ----
AbstractNode node=new AbstractNode(Children.LEAF);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 151,155 ****
new ThreadgroupSheet(oo));
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 160,165 ----
new ThreadgroupSheet(oo));
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 159,163 ****
new ClassSheet(oo));
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 169,174 ----
new ClassSheet(oo));
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 167,171 ****
new MethodSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 178,183 ----
new MethodSheet(oo), oo);
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 175,179 ****
new FieldSheet(oo));
node.setDisplayName(oo.toString());
! node.setIconBase("/org/openide/resources/beans");
return node;
}
--- 187,192 ----
new FieldSheet(oo));
node.setDisplayName(oo.toString());
! node.setIconBase(
! "/net/sourceforge/javaprofiler/module/resources/PDataIcon");
return node;
}
***************
*** 227,230 ****
--- 240,246 ----
/*
* $Log$
+ * Revision 1.3 2002/09/03 17:52:08 petrul
+ * icon changed
+ *
* Revision 1.2 2002/08/31 08:42:39 petrul
* now extends SortedArray
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:51:59
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv16457
Modified Files:
PDataComparator.java
Log Message:
Alloc Live and Alloc Total
Index: PDataComparator.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/PDataComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PDataComparator.java 31 Aug 2002 08:42:20 -0000 1.1
--- PDataComparator.java 3 Sep 2002 17:51:55 -0000 1.2
***************
*** 50,59 ****
/** Compare objects by name. */
public static final int NAME=1;
! /** Compare objects by Alloc. */
! public static final int ALLOC=2;
/** Compare objects by CPU. */
! public static final int CPU=3;
/** Compare objects by Mon. */
! public static final int MON=4;
private int type;
--- 50,61 ----
/** Compare objects by name. */
public static final int NAME=1;
! /** Compare objects by Alloc Live. */
! public static final int ALLOC_LIVE=2;
! /** Compare objects by Alloc Total. */
! public static final int ALLOC_TOTAL=3;
/** Compare objects by CPU. */
! public static final int CPU=4;
/** Compare objects by Mon. */
! public static final int MON=5;
private int type;
***************
*** 72,77 ****
case NAME:
return nameCompare((PDataNode) o1, (PDataNode) o2);
! case ALLOC:
! return allocCompare((PDataNode) o1, (PDataNode) o2);
case CPU:
return cpuCompare((PDataNode) o1, (PDataNode) o2);
--- 74,81 ----
case NAME:
return nameCompare((PDataNode) o1, (PDataNode) o2);
! case ALLOC_LIVE:
! return allocLiveCompare((PDataNode) o1, (PDataNode) o2);
! case ALLOC_TOTAL:
! return allocTotalCompare((PDataNode) o1, (PDataNode) o2);
case CPU:
return cpuCompare((PDataNode) o1, (PDataNode) o2);
***************
*** 87,92 ****
return n1.getDisplayName().compareTo(n2.getDisplayName());
}
! /** Compares by Alloc in descending order. */
! private int allocCompare(PDataNode n1, PDataNode n2) {
AllocStat a1=(AllocStat) n1.getDataObject();
AllocStat a2=(AllocStat) n2.getDataObject();
--- 91,96 ----
return n1.getDisplayName().compareTo(n2.getDisplayName());
}
! /** Compares by Alloc Live in descending order. */
! private int allocLiveCompare(PDataNode n1, PDataNode n2) {
AllocStat a1=(AllocStat) n1.getDataObject();
AllocStat a2=(AllocStat) n2.getDataObject();
***************
*** 100,103 ****
--- 104,120 ----
return 0;
}
+ /** Compares by Alloc Total in descending order. */
+ private int allocTotalCompare(PDataNode n1, PDataNode n2) {
+ AllocStat a1=(AllocStat) n1.getDataObject();
+ AllocStat a2=(AllocStat) n2.getDataObject();
+ long d=a1.getTotalInstancesSize() - a2.getTotalInstancesSize();
+ if (d!=0)
+ return (-d>0) ? 1 : -1;
+ d=a1.getLiveInstancesSize() - a2.getLiveInstancesSize();
+ if (d!=0)
+ return (-d>0) ? 1 : -1;
+ else
+ return 0;
+ }
/** Compares by CPU in descending order. */
private int cpuCompare(PDataNode n1, PDataNode n2) {
***************
*** 130,133 ****
--- 147,153 ----
/*
* $Log$
+ * Revision 1.2 2002/09/03 17:51:55 petrul
+ * Alloc Live and Alloc Total
+ *
* Revision 1.1 2002/08/31 08:42:20 petrul
* comparator of PDataNode
|
|
From: Lukas P. <pe...@us...> - 2002-09-03 17:51:48
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv16381
Modified Files:
InterfaceRepository.java
Log Message:
added getDefaultSort
Index: InterfaceRepository.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/InterfaceRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** InterfaceRepository.java 31 Aug 2002 08:41:42 -0000 1.2
--- InterfaceRepository.java 3 Sep 2002 17:51:44 -0000 1.3
***************
*** 40,44 ****
/** This class provides static methods that describe JPI objects. It is used for
* higher-order working with JPI objects and for presenting these objects to
! * end use.
* @author Lukas Petru
*/
--- 40,44 ----
/** This class provides static methods that describe JPI objects. It is used for
* higher-order working with JPI objects and for presenting these objects to
! * end user.
* @author Lukas Petru
*/
***************
*** 187,190 ****
--- 187,236 ----
}
+ public static Integer getDefaultSort(int type) {
+ switch(type) {
+ case Constants.THREAD:
+ case Constants.TYPE:
+ case Constants.ALLOC_TRACE:
+ case Constants.ALLOC_TYPE_TRACE:
+ case Constants.METHOD:
+ return new Integer(PDataComparator.ALLOC_LIVE);
+ case Constants.CPU_TRACE:
+ case Constants.CPU_THREAD_TRACE:
+ return new Integer(PDataComparator.CPU);
+ case Constants.MON_TRACE:
+ case Constants.MON_THREAD_TRACE:
+ return new Integer(PDataComparator.MON);
+ default:
+ return new Integer(PDataComparator.ZERO);
+ }
+ }
+
+ /** Returns types of parent objects (for multi-rooted objects). */
+ public static int[] getParentTypes(int type) {
+ switch(type) {
+ case Constants.NONE:
+ case Constants.THREAD:
+ case Constants.CPU_TRACE:
+ return new int[]{};
+ case Constants.CPU_THREAD_TRACE:
+ return new int[]{Constants.THREAD, Constants.CPU_TRACE};
+ case Constants.MON_TRACE:
+ return new int[]{};
+ case Constants.MON_THREAD_TRACE:
+ return new int[]{Constants.THREAD, Constants.MON_TRACE};
+ case Constants.TYPE:
+ case Constants.ALLOC_TRACE:
+ return new int[]{};
+ case Constants.ALLOC_TYPE_TRACE:
+ return new int[]{Constants.TYPE, Constants.ALLOC_TRACE};
+ case Constants.THREADGROUP:
+ case Constants.CLASS:
+ case Constants.METHOD:
+ case Constants.FIELD:
+ return new int[]{};
+ }
+ throw new IllegalArgumentException("Illegal:"+String.valueOf(type));
+ }
+
private static void init() {
if (!isInit) {
***************
*** 222,225 ****
--- 268,274 ----
/*
* $Log$
+ * Revision 1.3 2002/09/03 17:51:44 petrul
+ * added getDefaultSort
+ *
* Revision 1.2 2002/08/31 08:41:42 petrul
* hasAlloc, hasCPU and hasMon
|
