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-05-30 22:37:25
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv17900
Modified Files:
ThreadData.java
Log Message:
changed interface to jpi
added startTime, endTime
Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** ThreadData.java 14 May 2002 14:05:37 -0000 1.21
--- ThreadData.java 30 May 2002 22:37:22 -0000 1.22
***************
*** 24,28 ****
import net.sourceforge.javaprofiler.jpiimpl.commun.*;
! import net.sourceforge.javaprofiler.api.*;
/**
* Information about one thread.
--- 24,28 ----
import net.sourceforge.javaprofiler.jpiimpl.commun.*;
! import net.sourceforge.javaprofiler.jpi.*;
/**
* Information about one thread.
***************
*** 37,40 ****
--- 37,42 ----
private ThreadData parent;
private boolean active;
+ private Date endTime;
+ private Date startTime;
private final VirtualMachineImageRef vmImage;
***************
*** 81,88 ****
*/
ThreadData(Integer ID, String name, ThreadGroupData group,
! ThreadData parent, VirtualMachineImageRef vmImage, boolean active) {
super(ID);
this.threadName=name;
this.threadGroup=group;
this.parent=parent; //warning probably may be null
this.vmImage=vmImage;
--- 83,93 ----
*/
ThreadData(Integer ID, String name, ThreadGroupData group,
! ThreadData parent, VirtualMachineImageRef vmImage, Date startTime,
! Date endTime, boolean active) {
super(ID);
this.threadName=name;
this.threadGroup=group;
+ this.startTime = startTime;
+ this.endTime = endTime;
this.parent=parent; //warning probably may be null
this.vmImage=vmImage;
***************
*** 102,106 ****
VirtualMachineImageRef vmImage) {
this( new Integer(sid.objId), ((IProf.sThreadInfo)sid.info).threadName,
! group, parent, vmImage, sid.active);
if (sid.alloc != null)
--- 107,112 ----
VirtualMachineImageRef vmImage) {
this( new Integer(sid.objId), ((IProf.sThreadInfo)sid.info).threadName,
! group, parent, vmImage, ((IProf.sThreadInfo)sid.info).startTime,
! ((IProf.sThreadInfo)sid.info).endTime, sid.active);
if (sid.alloc != null)
***************
*** 246,249 ****
--- 252,273 ----
/**
+ * Returns start time of this thread.
+ *
+ * @return start time of this thread.
+ */
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ /**
+ * Returns end time of this thread.
+ *
+ * @return end time of this thread.
+ */
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ /**
* Returns VirtualMachineImage this method belongs to. The VirtualMachineImage could be live
* (realtime implementation) or static (snaphshot).
***************
*** 489,496 ****
--- 513,531 ----
return getName();
}
+
+ public void removeChildrenListener(String type, ChildrenListener listener) {
+ }
+
+ public void addChildrenListener(String type, ChildrenListener listener) {
+ }
+
}
/*
* $Log$
+ * Revision 1.22 2002/05/30 22:37:22 vachis
+ * changed interface to jpi
+ * added startTime, endTime
+ *
* Revision 1.21 2002/05/14 14:05:37 vachis
* "cross" methods
|
|
From: Pavel V. <va...@us...> - 2002-05-30 22:37:13
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv17727
Modified Files:
TypeData.java
Log Message:
changed interface to jpi
added startTime, endTime
Index: TypeData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/TypeData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TypeData.java 14 May 2002 14:05:37 -0000 1.2
--- TypeData.java 30 May 2002 22:37:09 -0000 1.3
***************
*** 24,28 ****
import net.sourceforge.javaprofiler.jpiimpl.commun.*;
! import net.sourceforge.javaprofiler.api.*;
/**
--- 24,28 ----
import net.sourceforge.javaprofiler.jpiimpl.commun.*;
! import net.sourceforge.javaprofiler.jpi.*;
/**
***************
*** 278,285 ****
--- 278,296 ----
return getName();
}
+
+ public void addChildrenListener(String type, ChildrenListener listener) {
+ }
+
+ public void removeChildrenListener(String type, ChildrenListener listener) {
+ }
+
}
/*
* $Log$
+ * Revision 1.3 2002/05/30 22:37:09 vachis
+ * changed interface to jpi
+ * added startTime, endTime
+ *
* Revision 1.2 2002/05/14 14:05:37 vachis
* "cross" methods
|
|
From: Pavel V. <va...@us...> - 2002-05-30 22:34:39
|
Update of /cvsroot/javaprofiler/jpiimpl
In directory usw-pr-cvs1:/tmp/cvs-serv15936
Modified Files:
build.xml
Log Message:
changed interface to jpi
Index: build.xml
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** build.xml 20 Apr 2002 22:35:42 -0000 1.9
--- build.xml 30 May 2002 22:34:35 -0000 1.10
***************
*** 16,20 ****
<path id="project.classpath">
<pathelement location="jpiimpl"/>
! <pathelement location="interface"/>
</path>
--- 16,20 ----
<path id="project.classpath">
<pathelement location="jpiimpl"/>
! <pathelement location="jpi"/>
</path>
***************
*** 32,43 ****
<!-- <target name="interface" depends="init">
! <javac debug="true" failonerror="true" srcdir="interface/net">
<classpath>
<pathelement location="jpiimpl"/>
! <pathelement location="interface"/>
</classpath>
<src>
<pathelement location="jpiimpl/net"/>
! <pathelement location="interface/net"/>
</src>
</javac>
--- 32,43 ----
<!-- <target name="interface" depends="init">
! <javac debug="true" failonerror="true" srcdir="jpi/net">
<classpath>
<pathelement location="jpiimpl"/>
! <pathelement location="jpi"/>
</classpath>
<src>
<pathelement location="jpiimpl/net"/>
! <pathelement location="jpi/net"/>
</src>
</javac>
***************
*** 51,55 ****
<src>
<pathelement location="jpiimpl"/>
! <pathelement location="interface"/>
</src>
<include name="net/**"/>
--- 51,55 ----
<src>
<pathelement location="jpiimpl"/>
! <pathelement location="jpi"/>
</src>
<include name="net/**"/>
***************
*** 73,77 ****
<exclude name="jpiimpl.jar"/>
</fileset>
! <fileset dir="interface">
<include name="net/**/*"/>
<patternset refid="project.jarpattern.exclude"/>
--- 73,77 ----
<exclude name="jpiimpl.jar"/>
</fileset>
! <fileset dir="jpi">
<include name="net/**/*"/>
<patternset refid="project.jarpattern.exclude"/>
***************
*** 119,123 ****
<sourcepath>
! <pathelement location="interface"/>
<pathelement location="jpiimpl"/>
</sourcepath>
--- 119,123 ----
<sourcepath>
! <pathelement location="jpi"/>
<pathelement location="jpiimpl"/>
</sourcepath>
***************
*** 146,150 ****
</delete>
<delete>
! <fileset dir="interface">
<include name="**/*.class"/>
</fileset>
--- 146,150 ----
</delete>
<delete>
! <fileset dir="jpi">
<include name="**/*.class"/>
</fileset>
|
Update of /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi
In directory usw-pr-cvs1:/tmp/cvs-serv10700
Modified Files:
AllocStat.java AllocStatEvent.java AllocStatListener.java
AllocThreadMethodRef.java AllocThreadTraceRef.java
AllocTraceRef.java AllocTypeMethodRef.java
AllocTypeThreadMethodRef.java AllocTypeThreadRef.java
AllocTypeThreadTraceRef.java AllocTypeTraceRef.java
ChildrenEvent.java ChildrenListener.java ClassRef.java
CPUStat.java CPUStatEvent.java CPUStatListener.java
CPUThreadMethodRef.java CPUThreadTraceRef.java
CPUTraceRef.java FieldRef.java FrameRef.java MethodRef.java
MonStat.java MonStatEvent.java MonStatListener.java
MonThreadMethodRef.java MonThreadTraceRef.java
MonTraceRef.java ThreadGroupRef.java TraceRef.java
TypeRef.java VirtualMachineImageRef.java
VirtualMachineRef.java
Log Message:
moved to jpi
fixies
Index: AllocStat.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocStat.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocStat.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocStat.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface AllocStat {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface AllocStat {
Index: AllocStatEvent.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocStatEvent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocStatEvent.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocStatEvent.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public class AllocStatEvent extends java.util.EventObject {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public class AllocStatEvent extends java.util.EventObject {
Index: AllocStatListener.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocStatListener.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocStatListener.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocStatListener.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface AllocStatListener {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface AllocStatListener {
Index: AllocThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocThreadMethodRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocThreadMethodRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocThreadMethodRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: AllocThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocThreadTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocThreadTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocThreadTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: AllocTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,8 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
! public interface AllocTraceRef extends AllocStat {
! List getFrames();
CPUTraceRef getSiblingCPU();
MonTraceRef getSiblingMon();
--- 1,7 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
! public interface AllocTraceRef extends AllocStat, TraceRef {
CPUTraceRef getSiblingCPU();
MonTraceRef getSiblingMon();
***************
*** 12,18 ****
List getAllocTypeTraces();
AllocTypeTraceRef getAllocTypeTrace( TypeRef peer);
-
- MethodRef getMethod();
- VirtualMachineImageRef getVirtualMachineImage();
void addChildrenListener( String type, ChildrenListener listener);
--- 11,14 ----
Index: AllocTypeMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeMethodRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocTypeMethodRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocTypeMethodRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: AllocTypeThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadMethodRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocTypeThreadMethodRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocTypeThreadMethodRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: AllocTypeThreadRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocTypeThreadRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocTypeThreadRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: AllocTypeThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocTypeThreadTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocTypeThreadTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: AllocTypeTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AllocTypeTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- AllocTypeTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: ChildrenEvent.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/ChildrenEvent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ChildrenEvent.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- ChildrenEvent.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public class ChildrenEvent extends java.util.EventObject {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public class ChildrenEvent extends java.util.EventObject {
Index: ChildrenListener.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/ChildrenListener.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ChildrenListener.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- ChildrenListener.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface ChildrenListener {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface ChildrenListener {
Index: ClassRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/ClassRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ClassRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- ClassRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: CPUStat.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUStat.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CPUStat.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- CPUStat.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface CPUStat {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface CPUStat {
Index: CPUStatEvent.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUStatEvent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CPUStatEvent.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- CPUStatEvent.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public class CPUStatEvent extends java.util.EventObject {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public class CPUStatEvent extends java.util.EventObject {
Index: CPUStatListener.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUStatListener.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CPUStatListener.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- CPUStatListener.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface CPUStatListener {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface CPUStatListener {
Index: CPUThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUThreadMethodRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CPUThreadMethodRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- CPUThreadMethodRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: CPUThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUThreadTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CPUThreadTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- CPUThreadTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: CPUTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CPUTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- CPUTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,8 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
! public interface CPUTraceRef extends CPUStat {
! List getFrames();
AllocTraceRef getSiblingAlloc();
MonTraceRef getSiblingMon();
--- 1,7 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
! public interface CPUTraceRef extends CPUStat, TraceRef {
AllocTraceRef getSiblingAlloc();
MonTraceRef getSiblingMon();
***************
*** 10,16 ****
List getCPUThreadTraces();
CPUThreadTraceRef getCPUThreadTrace( ThreadRef peer);
-
- MethodRef getMethod();
- VirtualMachineImageRef getVirtualMachineImage();
void addChildrenListener( String type, ChildrenListener listener);
--- 9,12 ----
Index: FieldRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/FieldRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** FieldRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- FieldRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: FrameRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/FrameRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** FrameRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- FrameRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: MethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MethodRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MethodRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- MethodRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: MonStat.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonStat.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MonStat.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- MonStat.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface MonStat {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface MonStat {
Index: MonStatEvent.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonStatEvent.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MonStatEvent.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- MonStatEvent.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public class MonStatEvent extends java.util.EventObject {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public class MonStatEvent extends java.util.EventObject {
Index: MonStatListener.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonStatListener.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MonStatListener.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- MonStatListener.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface MonStatListener {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface MonStatListener {
Index: MonThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonThreadMethodRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MonThreadMethodRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- MonThreadMethodRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: MonThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonThreadTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MonThreadTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- MonThreadTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: MonTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonTraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** MonTraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- MonTraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,8 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
! public interface MonTraceRef extends MonStat {
! List getFrames();
CPUTraceRef getSiblingCPU();
AllocTraceRef getSiblingAlloc();
--- 1,7 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
! public interface MonTraceRef extends MonStat, TraceRef {
CPUTraceRef getSiblingCPU();
AllocTraceRef getSiblingAlloc();
***************
*** 10,16 ****
List getMonThreadTraces();
MonThreadTraceRef getMonThreadTrace( ThreadRef peer);
-
- MethodRef getMethod();
- VirtualMachineImageRef getVirtualMachineImage();
void addChildrenListener( String type, ChildrenListener listener);
--- 9,12 ----
Index: ThreadGroupRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/ThreadGroupRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ThreadGroupRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- ThreadGroupRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: TraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/TraceRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** TraceRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- TraceRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: TypeRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/TypeRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** TypeRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- TypeRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
Index: VirtualMachineImageRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/VirtualMachineImageRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** VirtualMachineImageRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- VirtualMachineImageRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
***************
*** 11,15 ****
List getMonTraces();
List getTypes();
- List getCallTrees();
List getThreadGroups();
List getClasses();
--- 11,14 ----
Index: VirtualMachineRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/VirtualMachineRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** VirtualMachineRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- VirtualMachineRef.java 30 May 2002 22:26:42 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
public interface VirtualMachineRef extends VirtualMachineImageRef {
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
public interface VirtualMachineRef extends VirtualMachineImageRef {
|
|
From: Pavel V. <va...@us...> - 2002-05-30 22:26:23
|
Update of /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi
In directory usw-pr-cvs1:/tmp/cvs-serv10428
Modified Files:
CallTreeRef.java
Log Message:
moved to jpi
method renamed to getParent()
Index: CallTreeRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CallTreeRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** CallTreeRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- CallTreeRef.java 30 May 2002 22:26:19 -0000 1.2
***************
*** 1,3 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
--- 1,3 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
***************
*** 8,12 ****
long getCPUPureTime();
long getCPUCumulativeTime();
! CallTreeRef getParentCallTree();
List getChildren();
--- 8,12 ----
long getCPUPureTime();
long getCPUCumulativeTime();
! CallTreeRef getParent();
List getChildren();
|
|
From: Pavel V. <va...@us...> - 2002-05-30 22:25:47
|
Update of /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi
In directory usw-pr-cvs1:/tmp/cvs-serv10087
Modified Files:
ThreadRef.java
Log Message:
moved to jpi
getStartTime(), getEndTime() returns Data
Index: ThreadRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/ThreadRef.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ThreadRef.java 30 May 2002 21:52:13 -0000 1.1.1.1
--- ThreadRef.java 30 May 2002 22:25:43 -0000 1.2
***************
*** 1,5 ****
! package net.sourceforge.javaprofiler.api;
import java.util.List;
public interface ThreadRef extends CPUStat, AllocStat, MonStat {
--- 1,6 ----
! package net.sourceforge.javaprofiler.jpi;
import java.util.List;
+ import java.util.Date;
public interface ThreadRef extends CPUStat, AllocStat, MonStat {
***************
*** 8,13 ****
List getChildThreads();
CallTreeRef getCallTree();
! long getStartTime();
! long getEndTime();
List getCPUThreadMethods();
--- 9,14 ----
List getChildThreads();
CallTreeRef getCallTree();
! Date getStartTime();
! Date getEndTime();
List getCPUThreadMethods();
***************
*** 25,29 ****
List getAllocTypeThreads();
AllocTypeThreadRef getAllocTypeThread( TypeRef peer);
- List getCallTrees();
ThreadGroupRef getThreadGroup();
--- 26,29 ----
|
|
From: Pavel V. <va...@us...> - 2002-05-30 21:52:19
|
Update of /cvsroot/javaprofiler/jpi In directory usw-pr-cvs1:/tmp/cvs-serv21401 Log Message: interface by michal Status: Vendor Tag: avendor Release Tags: arelease N jpi/net/sourceforge/javaprofiler/jpi/TypeRef.java N jpi/net/sourceforge/javaprofiler/jpi/MethodRef.java N jpi/net/sourceforge/javaprofiler/jpi/MonTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocStat.java N jpi/net/sourceforge/javaprofiler/jpi/AllocThreadTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadRef.java N jpi/net/sourceforge/javaprofiler/jpi/MonStatListener.java N jpi/net/sourceforge/javaprofiler/jpi/AllocTypeTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/CallTreeRef.java N jpi/net/sourceforge/javaprofiler/jpi/ChildrenEvent.java N jpi/net/sourceforge/javaprofiler/jpi/ChildrenListener.java N jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocTypeMethodRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocThreadMethodRef.java N jpi/net/sourceforge/javaprofiler/jpi/CPUTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/MonStatEvent.java N jpi/net/sourceforge/javaprofiler/jpi/CPUStat.java N jpi/net/sourceforge/javaprofiler/jpi/FieldRef.java N jpi/net/sourceforge/javaprofiler/jpi/VirtualMachineRef.java N jpi/net/sourceforge/javaprofiler/jpi/ClassRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocStatEvent.java N jpi/net/sourceforge/javaprofiler/jpi/VirtualMachineImageRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadMethodRef.java N jpi/net/sourceforge/javaprofiler/jpi/MonStat.java N jpi/net/sourceforge/javaprofiler/jpi/MonThreadMethodRef.java N jpi/net/sourceforge/javaprofiler/jpi/CPUThreadTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/TraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/ThreadRef.java N jpi/net/sourceforge/javaprofiler/jpi/CPUThreadMethodRef.java N jpi/net/sourceforge/javaprofiler/jpi/ThreadGroupRef.java N jpi/net/sourceforge/javaprofiler/jpi/CPUStatEvent.java N jpi/net/sourceforge/javaprofiler/jpi/MonThreadTraceRef.java N jpi/net/sourceforge/javaprofiler/jpi/CPUStatListener.java N jpi/net/sourceforge/javaprofiler/jpi/FrameRef.java N jpi/net/sourceforge/javaprofiler/jpi/AllocStatListener.java N jpi/net/sourceforge/javaprofiler/other/MonitorStatContainer.java N jpi/net/sourceforge/javaprofiler/other/CPUStatContainer.java N jpi/net/sourceforge/javaprofiler/other/CallTreeStatContainer.java N jpi/net/sourceforge/javaprofiler/other/AllocStatContainer.java No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources |
|
From: Lukas P. <pe...@us...> - 2002-05-28 17:14:40
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime In directory usw-pr-cvs1:/tmp/cvs-serv25846 Removed Files: Location.java Log Message: not used any more --- Location.java DELETED --- |
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime
In directory usw-pr-cvs1:/tmp/cvs-serv24156
Modified Files:
AllocThreadMethodR.java AllocThreadTraceR.java
AllocTraceR.java AllocTypeMethodR.java AllocTypeR.java
AllocTypeThreadMethodR.java AllocTypeThreadR.java
AllocTypeThreadTraceR.java AllocTypeTraceR.java
CPUThreadMethodR.java CPUThreadTraceR.java CPUTraceR.java
ClassR.java DataR.java FrameR.java ImageR.java MethodR.java
MonThreadMethodR.java MonThreadTraceR.java MonTraceR.java
ThreadGroupR.java ThreadR.java
Log Message:
added siblings and getter methods with specific peer argument
Index: AllocThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadMethodR.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocThreadMethodR.java 15 May 2002 08:26:36 -0000 1.4
--- AllocThreadMethodR.java 28 May 2002 17:13:48 -0000 1.5
***************
*** 159,163 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 159,163 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 285,288 ****
--- 285,312 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns CPUThreadMethodRef of the same Thread and the same Method. */
+ public CPUThreadMethodRef getSiblingCPU() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshCPUThreadMethods();
+ List o=thread.getCPUThreadMethods();
+ return (CPUThreadMethodRef) image.filterByLocation(o, getLocation());
+ }
+
+ /** Returns MonThreadMethodRef of the same Thread and the same Method. */
+ public MonThreadMethodRef getSiblingMon() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshMonThreadMethods();
+ List o=thread.getMonThreadMethods();
+ return (MonThreadMethodRef) image.filterByLocation(o, getLocation());
+ }
+
+ /** Returns specific element of AllocTypeThreadMethods list. */
+ public AllocTypeThreadMethodRef getAllocTypeThreadMethod(TypeRef peer) {
+ List o=getAllocTypeThreadMethods();
+ return (AllocTypeThreadMethodRef) image.filterByType(o,(DataR) peer);
}
Index: AllocThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadTraceR.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AllocThreadTraceR.java 15 May 2002 08:26:36 -0000 1.3
--- AllocThreadTraceR.java 28 May 2002 17:13:49 -0000 1.4
***************
*** 151,155 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 151,155 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 287,292 ****
}
public String toString() {
return getThreadR() + "-" + getLocation();
}
! }
\ No newline at end of file
--- 287,318 ----
}
+ /** Returns CPUThreadTraceRef of the same Thread and the same Trace. */
+ public CPUThreadTraceRef getSiblingCPU() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshCPUThreadTraces();
+ List o=thread.getCPUThreadTraces();
+ return (CPUThreadTraceRef) image.filterByLocationFrames(o,
+ location.getFrames());
+ }
+
+ /** Returns MonThreadTraceRef of the same Thread and the same Trace. */
+ public MonThreadTraceRef getSiblingMon() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshMonThreadTraces();
+ List o=thread.getMonThreadTraces();
+ return (MonThreadTraceRef) image.filterByLocationFrames(o,
+ location.getFrames());
+ }
+
+ /** Returns specific element of AllocTypeThreadTraces list. */
+ public AllocTypeThreadTraceRef getAllocTypeThreadTrace(TypeRef peer) {
+ List o=getAllocTypeThreadTraces();
+ return (AllocTypeThreadTraceRef) image.filterByType(o,(DataR) peer);
+ }
+
public String toString() {
return getThreadR() + "-" + getLocation();
}
! }
Index: AllocTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTraceR.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTraceR.java 15 May 2002 08:26:36 -0000 1.4
--- AllocTraceR.java 28 May 2002 17:13:49 -0000 1.5
***************
*** 43,47 ****
* @author Lukas Petru
*/
! public class AllocTraceR extends Location implements AllocTraceRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
--- 43,47 ----
* @author Lukas Petru
*/
! public class AllocTraceR extends DataR implements AllocTraceRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
***************
*** 207,211 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
return this;
}
--- 207,211 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return this;
}
***************
*** 281,284 ****
--- 281,314 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns CPUTraceRef of the same Trace. */
+ public CPUTraceRef getSiblingCPU() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ image.refreshCPUTraces();
+ List o=image.getCPUTraces();
+ return (CPUTraceRef) image.filterByFrames(o, getFrames());
+ }
+
+ /** Returns MonTraceRef of the same Trace. */
+ public MonTraceRef getSiblingMon() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ image.refreshMonTraces();
+ List o=image.getMonTraces();
+ return (MonTraceRef) image.filterByFrames(o, getFrames());
+ }
+
+ /** Returns specific element of AllocThreadTraces list. */
+ public AllocThreadTraceRef getAllocThreadTrace(ThreadRef peer) {
+ List o=getAllocThreadTraces();
+ return (AllocThreadTraceRef) image.filterByThread(o,(DataR) peer);
+ }
+
+ /** Returns specific element of AllocTypeTraces list. */
+ public AllocTypeTraceRef getAllocTypeTrace(TypeRef peer) {
+ List o=getAllocTypeTraces();
+ return (AllocTypeTraceRef) image.filterByType(o,(DataR) peer);
}
Index: AllocTypeMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeMethodR.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeMethodR.java 15 May 2002 08:26:36 -0000 1.4
--- AllocTypeMethodR.java 28 May 2002 17:13:49 -0000 1.5
***************
*** 133,137 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 133,137 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 275,278 ****
--- 275,284 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns specific element of AllocTypeThreadMethods list. */
+ public AllocTypeThreadMethodRef getAllocTypeThreadMethod(ThreadRef peer) {
+ List o=getAllocTypeThreadMethods();
+ return (AllocTypeThreadMethodRef) image.filterByThread(o, (DataR)peer);
}
Index: AllocTypeR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AllocTypeR.java 15 May 2002 08:26:36 -0000 1.2
--- AllocTypeR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 219,223 ****
}
! public Location getLocation() {
return null;
}
--- 219,223 ----
}
! public DataR getLocation() {
return null;
}
***************
*** 354,357 ****
--- 354,375 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns specific element of AllocTypeTraces list. */
+ public AllocTypeTraceRef getAllocTypeTrace(AllocTraceRef peer) {
+ List o=getAllocTypeTraces();
+ return (AllocTypeTraceRef) image.filterByLocation(o, (DataR)peer);
+ }
+
+ /** Returns specific element of AllocTypeMethods list. */
+ public AllocTypeMethodRef getAllocTypeMethod(MethodRef peer) {
+ List o=getAllocTypeMethods();
+ return (AllocTypeMethodRef) image.filterByLocation(o, (DataR)peer);
+ }
+
+ /** Returns specific element of AllocTypeThreads list. */
+ public AllocTypeThreadRef getAllocTypeThread(ThreadRef peer) {
+ List o=getAllocTypeThreads();
+ return (AllocTypeThreadRef) image.filterByThread(o, (DataR)peer);
}
Index: AllocTypeThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadMethodR.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeThreadMethodR.java 15 May 2002 08:26:36 -0000 1.4
--- AllocTypeThreadMethodR.java 28 May 2002 17:13:49 -0000 1.5
***************
*** 155,159 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 155,159 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
Index: AllocTypeThreadR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadR.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** AllocTypeThreadR.java 15 May 2002 08:26:36 -0000 1.5
--- AllocTypeThreadR.java 28 May 2002 17:13:49 -0000 1.6
***************
*** 134,138 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return null;
--- 134,138 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return null;
***************
*** 282,285 ****
--- 282,299 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns specific element of AllocTypeThreadMethods list. */
+ public AllocTypeThreadMethodRef getAllocTypeThreadMethod(MethodRef peer) {
+ List o=getAllocTypeThreadMethods();
+ return (AllocTypeThreadMethodRef) image.filterByLocation(o, (DataR)
+ peer);
+ }
+
+ /** Returns specific element of AllocTypeThreadTraces list. */
+ public AllocTypeThreadTraceRef getAllocTypeThreadTrace(AllocTraceRef peer) {
+ List o=getAllocTypeThreadTraces();
+ return (AllocTypeThreadTraceRef) image.filterByLocation(o, (DataR)
+ peer);
}
Index: AllocTypeThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadTraceR.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AllocTypeThreadTraceR.java 15 May 2002 08:26:36 -0000 1.3
--- AllocTypeThreadTraceR.java 28 May 2002 17:13:49 -0000 1.4
***************
*** 143,147 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 143,147 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
Index: AllocTypeTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeTraceR.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeTraceR.java 15 May 2002 08:26:36 -0000 1.4
--- AllocTypeTraceR.java 28 May 2002 17:13:49 -0000 1.5
***************
*** 150,154 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 150,154 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 284,287 ****
--- 284,294 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns specific element of AllocTypeThreadTraces list. */
+ public AllocTypeThreadTraceRef getAllocTypeThreadTrace(ThreadRef peer) {
+ List o=getAllocTypeThreadTraces();
+ return (AllocTypeThreadTraceRef) image.filterByThread(o, (DataR)
+ peer);
}
Index: CPUThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadMethodR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CPUThreadMethodR.java 15 May 2002 08:26:36 -0000 1.2
--- CPUThreadMethodR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 143,147 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 143,147 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 254,257 ****
--- 254,275 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns AllocThreadMethodRef of the same Thread and the same Method. */
+ public AllocThreadMethodRef getSiblingAlloc() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshAllocThreadMethods();
+ List o=thread.getAllocThreadMethods();
+ return (AllocThreadMethodRef) image.filterByLocation(o, getLocation());
+ }
+
+ /** Returns MonThreadMethodRef of the same Thread and the same Method. */
+ public MonThreadMethodRef getSiblingMon() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshMonThreadMethods();
+ List o=thread.getMonThreadMethods();
+ return (MonThreadMethodRef) image.filterByLocation(o, getLocation());
}
Index: CPUThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadTraceR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CPUThreadTraceR.java 15 May 2002 08:26:36 -0000 1.2
--- CPUThreadTraceR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 131,135 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 131,135 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 251,254 ****
--- 251,274 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns AllocThreadTraceRef of the same Thread and the same Trace. */
+ public AllocThreadTraceRef getSiblingAlloc() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshAllocThreadTraces();
+ List o=thread.getAllocThreadTraces();
+ return (AllocThreadTraceRef) image.filterByLocationFrames(o,
+ location.getFrames());
+ }
+
+ /** Returns MonThreadTraceRef of the same Thread and the same Trace. */
+ public MonThreadTraceRef getSiblingMon() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshMonThreadTraces();
+ List o=thread.getMonThreadTraces();
+ return (MonThreadTraceRef) image.filterByLocationFrames(o,
+ location.getFrames());
}
Index: CPUTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUTraceR.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CPUTraceR.java 15 May 2002 08:26:36 -0000 1.3
--- CPUTraceR.java 28 May 2002 17:13:49 -0000 1.4
***************
*** 43,47 ****
* @author Lukas Petru
*/
! public class CPUTraceR extends Location implements CPUTraceRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
--- 43,47 ----
* @author Lukas Petru
*/
! public class CPUTraceR extends DataR implements CPUTraceRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
***************
*** 170,174 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
return this;
}
--- 170,174 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return this;
}
***************
*** 247,250 ****
--- 247,274 ----
}
+ /** Returns AllocTraceRef of the same Trace. */
+ public AllocTraceRef getSiblingAlloc() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ image.refreshAllocTraces();
+ List o=image.getAllocTraces();
+ return (AllocTraceRef) image.filterByFrames(o, getFrames());
+ }
+
+ /** Returns MonTraceRef of the same Trace. */
+ public MonTraceRef getSiblingMon() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ image.refreshMonTraces();
+ List o=image.getMonTraces();
+ return (MonTraceRef) image.filterByFrames(o, getFrames());
+ }
+
+ /** Returns specific element of CPUThreadTraces list. */
+ public CPUThreadTraceRef getCPUThreadTrace(ThreadRef peer) {
+ List o=getCPUThreadTraces();
+ return (CPUThreadTraceRef) image.filterByThread(o,(DataR) peer);
+ }
+
public String toString() {
return "trace of " + getMethod();
Index: ClassR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ClassR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ClassR.java 15 May 2002 08:26:36 -0000 1.2
--- ClassR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 178,182 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
return null;
}
--- 178,182 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return null;
}
Index: DataR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/DataR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DataR.java 15 May 2002 08:26:36 -0000 1.2
--- DataR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 68,71 ****
* </code> if this root is N / A.
*/
! public abstract Location getLocation();
}
--- 68,71 ----
* </code> if this root is N / A.
*/
! public abstract DataR getLocation();
}
Index: FrameR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/FrameR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FrameR.java 15 May 2002 08:26:36 -0000 1.2
--- FrameR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 69,72 ****
--- 69,82 ----
}
+ /** Defines that two frames are equal iff they have same lineno and point
+ * to the same method (tested via ==).
+ */
+ public boolean equals(Object o) {
+ if (!(o instanceof FrameR))
+ return false;
+ FrameR frame=(FrameR) o;
+ return lineno==frame.lineno && method==frame.method;
+ }
+
public String toString() {
return getMethod() + ":" + getLineNo();
Index: ImageR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ImageR.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ImageR.java 15 May 2002 08:26:36 -0000 1.6
--- ImageR.java 28 May 2002 17:13:49 -0000 1.7
***************
*** 468,472 ****
/** Refreshes <code>Type</code> list by loading new data from profiled JVM.
*/
! public void refreshAllocTypes() {
extractRoot(IProf.OBJECT_TYPES, typeFactory, types);
}
--- 468,472 ----
/** Refreshes <code>Type</code> list by loading new data from profiled JVM.
*/
! public void refreshTypes() {
extractRoot(IProf.OBJECT_TYPES, typeFactory, types);
}
***************
*** 475,479 ****
public List getTypes() {
if (isAlwaysRefresh)
! refreshAllocTypes();
return roTypes;
}
--- 475,479 ----
public List getTypes() {
if (isAlwaysRefresh)
! refreshTypes();
return roTypes;
}
***************
*** 803,807 ****
optionalArg, boolean clearFlag) throws COMMUN_Exception,
BAD_OBJ_ID_Exception, BAD_COMMAND_Exception, UNKNOWN_Exception {
! if ( getAllFlags.add(new Long(direction << 32 + parent)) ) {
return iprof.getAllThruIterator(parent, direction,
sameOutputObject, includeInfo, optionalArg, clearFlag);
--- 803,809 ----
optionalArg, boolean clearFlag) throws COMMUN_Exception,
BAD_OBJ_ID_Exception, BAD_COMMAND_Exception, UNKNOWN_Exception {
! long dirLong=direction;
! Long key=new Long((dirLong << 32) + parent);
! if ( getAllFlags.add(key) ) {
return iprof.getAllThruIterator(parent, direction,
sameOutputObject, includeInfo, optionalArg, clearFlag);
***************
*** 812,817 ****
}
public String toString() {
return "realtime VirtualMachineImage";
}
! }
\ No newline at end of file
--- 814,919 ----
}
+ // --------------------------------------------------------- list filtering
+
+ /** Processes the given list of <code>DataR</code> elements and selects one
+ * element from the list, which has the requested type.
+ * @return selected element or <code>null</code> if no element satisfies
+ * the criterion
+ */
+ DataR filterByType (List inList, DataR keyType) {
+ Iterator it=inList.iterator();
+ while (it.hasNext()) {
+ DataR el=(DataR) it.next();
+ if (el.getTypeR()==keyType)
+ return el;
+ }
+ return null;
+ }
+
+ /** Processes the given list of <code>DataR</code> elements and selects one
+ * element from the list, which has the requested thread.
+ * @return selected element or <code>null</code> if no element satisfies
+ * the criterion
+ */
+ DataR filterByThread (List inList, DataR keyThread) {
+ Iterator it=inList.iterator();
+ while (it.hasNext()) {
+ DataR el=(DataR) it.next();
+ if (el.getThreadR()==keyThread)
+ return el;
+ }
+ return null;
+ }
+
+ /** Processes the given list of <code>DataR</code> elements and selects one
+ * element from the list, which has the requested location.
+ * @return selected element or <code>null</code> if no element satisfies
+ * the criterion
+ */
+ DataR filterByLocation (List inList, DataR keyLocation) {
+ Iterator it=inList.iterator();
+ while (it.hasNext()) {
+ DataR el=(DataR) it.next();
+ if (el.getLocation()==keyLocation)
+ return el;
+ }
+ return null;
+ }
+
+ /** Processes the given list of <code>DataR</code> elements and selects one
+ * element from the list, which has the requested frames.
+ * @param inList This List must contain elements of type AllocTraceR,
+ * CPUTraceR or MonTraceR.
+ * @return selected element or <code>null</code> if no element satisfies
+ * the criterion
+ */
+ DataR filterByFrames (List inList, List frames) {
+ Iterator it=inList.iterator();
+ while (it.hasNext()) {
+ Object el=it.next();
+ if (el instanceof AllocTraceR) {
+ if (((AllocTraceR)el).getFrames().equals(frames))
+ return (DataR) el;
+ } else if (el instanceof CPUTraceR) {
+ if (((CPUTraceR)el).getFrames().equals(frames))
+ return (DataR) el;
+ } else if (el instanceof MonTraceR) {
+ if (((MonTraceR)el).getFrames().equals(frames))
+ return (DataR) el;
+ }
+ }
+ return null;
+ }
+
+ /** Processes the given list of <code>DataR</code> elements and selects one
+ * element from the list, location of which has the requested frames.
+ * @param inList This List must contain elements which are instances
+ of some MultiRoot type, which have valid location.
+ * @return selected element or <code>null</code> if no element satisfies
+ * the criterion
+ */
+ DataR filterByLocationFrames (List inList, List frames) {
+ System.out.println(frames);
+ Iterator it=inList.iterator();
+ while (it.hasNext()) {
+ DataR data=(DataR) it.next();
+ DataR location=data.getLocation();
+ System.out.println(location);
+ if (location instanceof AllocTraceR) {
+ if (((AllocTraceR) location).getFrames().equals(frames))
+ return data;
+ } else if (location instanceof CPUTraceR) {
+ if (((CPUTraceR) location).getFrames().equals(frames))
+ return data;
+ } else if (location instanceof MonTraceR) {
+ if (((MonTraceR) location).getFrames().equals(frames))
+ return data;
+ }
+ }
+ return null;
+ }
+
public String toString() {
return "realtime VirtualMachineImage";
}
! }
Index: MethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MethodR.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MethodR.java 15 May 2002 08:26:36 -0000 1.4
--- MethodR.java 28 May 2002 17:13:49 -0000 1.5
***************
*** 43,47 ****
* @author Lukas Petru
*/
! public class MethodR extends Location implements MethodRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
--- 43,47 ----
* @author Lukas Petru
*/
! public class MethodR extends DataR implements MethodRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
***************
*** 302,306 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
return this;
}
--- 302,306 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return this;
}
***************
*** 445,448 ****
--- 445,472 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns specific element of CPUThreadMethods list. */
+ public CPUThreadMethodRef getCPUThreadMethod(ThreadRef peer) {
+ List o=getCPUThreadMethods();
+ return (CPUThreadMethodRef) image.filterByThread(o,(DataR) peer);
+ }
+
+ /** Returns specific element of AllocThreadMethods list. */
+ public AllocThreadMethodRef getAllocThreadMethod(ThreadRef peer) {
+ List o=getAllocThreadMethods();
+ return (AllocThreadMethodRef) image.filterByThread(o,(DataR) peer);
+ }
+
+ /** Returns specific element of MonThreadMethods list. */
+ public MonThreadMethodRef getMonThreadMethod(ThreadRef peer) {
+ List o=getMonThreadMethods();
+ return (MonThreadMethodRef) image.filterByThread(o,(DataR) peer);
+ }
+
+ /** Returns specific element of AllocTypeMethods list. */
+ public AllocTypeMethodRef getAllocTypeMethod(TypeRef peer) {
+ List o=getAllocTypeMethods();
+ return (AllocTypeMethodRef) image.filterByType(o,(DataR) peer);
}
Index: MonThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadMethodR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MonThreadMethodR.java 15 May 2002 08:26:36 -0000 1.2
--- MonThreadMethodR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 143,147 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 143,147 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 256,261 ****
}
public String toString() {
return getThreadR() + "-" + getLocation();
}
! }
\ No newline at end of file
--- 256,279 ----
}
+ /** Returns CPUThreadMethodRef of the same Thread and the same Method. */
+ public CPUThreadMethodRef getSiblingCPU() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshCPUThreadMethods();
+ List o=thread.getCPUThreadMethods();
+ return (CPUThreadMethodRef) image.filterByLocation(o, getLocation());
+ }
+
+ /** Returns AllocThreadMethodRef of the same Thread and the same Method. */
+ public AllocThreadMethodRef getSiblingAlloc() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshAllocThreadMethods();
+ List o=thread.getAllocThreadMethods();
+ return (AllocThreadMethodRef) image.filterByLocation(o, getLocation());
+ }
+
public String toString() {
return getThreadR() + "-" + getLocation();
}
! }
Index: MonThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadTraceR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MonThreadTraceR.java 15 May 2002 08:26:36 -0000 1.2
--- MonThreadTraceR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 131,135 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
needConstructed();
return location;
--- 131,135 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
***************
*** 253,258 ****
}
public String toString() {
return getThreadR() + "-" + getLocation();
}
! }
\ No newline at end of file
--- 253,278 ----
}
+ /** Returns CPUThreadTraceRef of the same Thread and the same Trace. */
+ public CPUThreadTraceRef getSiblingCPU() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshCPUThreadTraces();
+ List o=thread.getCPUThreadTraces();
+ return (CPUThreadTraceRef) image.filterByLocationFrames(o,
+ location.getFrames());
+ }
+
+ /** Returns AllocThreadTraceRef of the same Thread and the same Trace. */
+ public AllocThreadTraceRef getSiblingAlloc() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ thread.refreshAllocThreadTraces();
+ List o=thread.getAllocThreadTraces();
+ return (AllocThreadTraceRef) image.filterByLocationFrames(o,
+ location.getFrames());
+ }
+
public String toString() {
return getThreadR() + "-" + getLocation();
}
! }
Index: MonTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonTraceR.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MonTraceR.java 15 May 2002 08:26:36 -0000 1.3
--- MonTraceR.java 28 May 2002 17:13:49 -0000 1.4
***************
*** 43,47 ****
* @author Lukas Petru
*/
! public class MonTraceR extends Location implements MonTraceRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
--- 43,47 ----
* @author Lukas Petru
*/
! public class MonTraceR extends DataR implements MonTraceRef {
/** Tells if any data was loaded from profiled VM about this Type. */
private boolean isReady;
***************
*** 165,169 ****
}
! public Location getLocation() {
return this;
}
--- 165,169 ----
}
! public DataR getLocation() {
return this;
}
***************
*** 235,238 ****
--- 235,262 ----
}
+ /** Returns AllocTraceRef of the same Trace. */
+ public AllocTraceRef getSiblingAlloc() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ image.refreshAllocTraces();
+ List o=image.getAllocTraces();
+ return (AllocTraceRef) image.filterByFrames(o, getFrames());
+ }
+
+ /** Returns CPUTraceRef of the same Trace. */
+ public CPUTraceRef getSiblingCPU() {
+ needConstructed();
+ if (!image.getAlwaysRefresh())
+ image.refreshCPUTraces();
+ List o=image.getCPUTraces();
+ return (CPUTraceRef) image.filterByFrames(o, getFrames());
+ }
+
+ /** Returns specific element of MonThreadTraces list. */
+ public MonThreadTraceRef getMonThreadTrace(ThreadRef peer) {
+ List o=getMonThreadTraces();
+ return (MonThreadTraceRef) image.filterByThread(o,(DataR) peer);
+ }
+
public String toString() {
return "trace of " + getMethod();
Index: ThreadGroupR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadGroupR.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ThreadGroupR.java 15 May 2002 08:26:36 -0000 1.2
--- ThreadGroupR.java 28 May 2002 17:13:49 -0000 1.3
***************
*** 126,130 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
return null;
}
--- 126,130 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return null;
}
Index: ThreadR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadR.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ThreadR.java 15 May 2002 08:26:36 -0000 1.5
--- ThreadR.java 28 May 2002 17:13:49 -0000 1.6
***************
*** 323,327 ****
* </code> if this root is N / A.
*/
! public Location getLocation() {
return null;
}
--- 323,327 ----
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return null;
}
***************
*** 466,469 ****
--- 466,511 ----
Integer getId() {
return objId;
+ }
+
+ /** Returns specific element of CPUThreadMethods list. */
+ public CPUThreadMethodRef getCPUThreadMethod(MethodRef peer) {
+ List o=getCPUThreadMethods();
+ return (CPUThreadMethodRef) image.filterByLocation(o, (DataR) peer);
+ }
+
+ /** Returns specific element of CPUThreadTraces list. */
+ public CPUThreadTraceRef getCPUThreadTrace(CPUTraceRef peer) {
+ List o=getCPUThreadTraces();
+ return (CPUThreadTraceRef) image.filterByLocation(o, (DataR) peer);
+ }
+
+ /** Returns specific element of AllocThreadMethods list. */
+ public AllocThreadMethodRef getAllocThreadMethod(MethodRef peer) {
+ List o=getAllocThreadMethods();
+ return (AllocThreadMethodRef) image.filterByLocation(o, (DataR) peer);
+ }
+
+ /** Returns specific element of AllocThreadTraces list. */
+ public AllocThreadTraceRef getAllocThreadTrace(AllocTraceRef peer) {
+ List o=getAllocThreadTraces();
+ return (AllocThreadTraceRef) image.filterByLocation(o, (DataR) peer);
+ }
+
+ /** Returns specific element of MonThreadMethods list. */
+ public MonThreadMethodRef getMonThreadMethod(MethodRef peer) {
+ List o=getMonThreadMethods();
+ return (MonThreadMethodRef) image.filterByLocation(o, (DataR) peer);
+ }
+
+ /** Returns specific element of MonThreadTraces list. */
+ public MonThreadTraceRef getMonThreadTrace(MonTraceRef peer) {
+ List o=getMonThreadTraces();
+ return (MonThreadTraceRef) image.filterByLocation(o, (DataR) peer);
+ }
+
+ /** Returns specific element of AllocTypeThreads list. */
+ public AllocTypeThreadRef getAllocTypeThread(TypeRef peer) {
+ List o=getAllocTypeThreads();
+ return (AllocTypeThreadRef) image.filterByType(o, (DataR) peer);
}
|
|
From: Marek P. <ma...@us...> - 2002-05-25 00:05:10
|
Update of /cvsroot/javaprofiler/library/src/shared In directory usw-pr-cvs1:/tmp/cvs-serv4699/src/shared Modified Files: thread.cpp thread.h Log Message: thread's start/finish time added Index: thread.cpp =================================================================== RCS file: /cvsroot/javaprofiler/library/src/shared/thread.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** thread.cpp 15 Apr 2002 21:04:18 -0000 1.11 --- thread.cpp 25 May 2002 00:05:06 -0000 1.12 *************** *** 53,56 **** --- 53,59 ---- else b += getProfID(); + b += (jlong)startTime; + b += (jlong)endTime; + return b; } Index: thread.h =================================================================== RCS file: /cvsroot/javaprofiler/library/src/shared/thread.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** thread.h 31 Jan 2002 12:31:01 -0000 1.24 --- thread.h 25 May 2002 00:05:06 -0000 1.25 *************** *** 95,98 **** --- 95,104 ---- int active; + /// time when thread has started + time_t startTime; + + /// time when thread has finished (or 0 if still active) + time_t endTime; + /// associated AllocThreadObjects List<AllocThreadObject,LI1> allocThreadObjects; *************** *** 160,163 **** --- 166,171 ---- threadEnvId( NULL), active( 1), + startTime( 0), + endTime( 0), monitorEnter(0), monitorEnterObject(0), |
|
From: Marek P. <ma...@us...> - 2002-05-25 00:05:09
|
Update of /cvsroot/javaprofiler/library/src/prof
In directory usw-pr-cvs1:/tmp/cvs-serv4699/src/prof
Modified Files:
prof_get.cpp prof_thread.cpp
Log Message:
thread's start/finish time added
Index: prof_get.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/prof/prof_get.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** prof_get.cpp 16 Apr 2002 12:41:35 -0000 1.12
--- prof_get.cpp 25 May 2002 00:05:05 -0000 1.13
***************
*** 524,528 ****
event.env_id = envId;
! event.u.thread_start.thread_name = "Thread-Unknown";
event.u.thread_start.group_name = "unknown";
event.u.thread_start.parent_name = NULL;
--- 524,537 ----
event.env_id = envId;
! static int num = 0;
! char buf[50];
!
! #ifndef WIN32
! snprintf( buf, sizeof( buf), "Thread-Unknown-%d", num++);
! #else
! _snprintf( buf, sizeof( buf), "Thread-Unknown-%d", num++);
! #endif
!
! event.u.thread_start.thread_name = buf;
event.u.thread_start.group_name = "unknown";
event.u.thread_start.parent_name = NULL;
Index: prof_thread.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/prof/prof_thread.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** prof_thread.cpp 15 Apr 2002 21:04:18 -0000 1.16
--- prof_thread.cpp 25 May 2002 00:05:06 -0000 1.17
***************
*** 86,89 ****
--- 86,91 ----
t->threadEnvId = envId;
+ t->startTime = time( NULL);
+
threads.add( t);
activeThreads.add( t);
***************
*** 120,123 ****
Thread* t = getThread( event->env_id, 0);
! if( t) t->deactivate();
}
--- 122,129 ----
Thread* t = getThread( event->env_id, 0);
! if( t) {
!
! t->endTime = time( NULL);
! t->deactivate();
! }
}
|
|
From: Marek P. <ma...@us...> - 2002-05-25 00:05:09
|
Update of /cvsroot/javaprofiler/library/src/commun In directory usw-pr-cvs1:/tmp/cvs-serv4699/src/commun Modified Files: iprof.h Log Message: thread's start/finish time added Index: iprof.h =================================================================== RCS file: /cvsroot/javaprofiler/library/src/commun/iprof.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** iprof.h 15 Apr 2002 21:04:17 -0000 1.18 --- iprof.h 25 May 2002 00:05:05 -0000 1.19 *************** *** 70,74 **** /// version number of communication interface ! INTERFACE_VERSION_NUMBER = 1, /// number of methods of the interface --- 70,74 ---- /// version number of communication interface ! INTERFACE_VERSION_NUMBER = 2, /// number of methods of the interface |
|
From: Marek P. <ma...@us...> - 2002-05-25 00:03:28
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun In directory usw-pr-cvs1:/tmp/cvs-serv4350/net/sourceforge/javaprofiler/jpiimpl/commun Modified Files: IProf.java Log Message: new features, thread's start/finish time Index: IProf.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun/IProf.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** IProf.java 15 Apr 2002 21:01:05 -0000 1.18 --- IProf.java 25 May 2002 00:03:23 -0000 1.19 *************** *** 55,59 **** /// version number of communication interface ! private static final int INTERFACE_VERSION_NUMBER = 1; /** Default constructor. Sockets are used --- 55,59 ---- /// version number of communication interface ! private static final int INTERFACE_VERSION_NUMBER = 2; /** Default constructor. Sockets are used *************** *** 533,536 **** --- 533,542 ---- /// parent thread public int parentObjId; + + /// time when thread has started + public Date startTime; + + /// time when thread has finished (null if thread is still active) + public Date endTime; }; *************** *** 795,799 **** th.parentObjId = b.getInt( offset); offset += 4; ! return offset; } --- 801,813 ---- th.parentObjId = b.getInt( offset); offset += 4; ! ! th.startTime = new Date( b.getLong( offset)); ! offset += 8; ! ! long et = b.getLong( offset); ! offset += 8; ! ! if( et != 0) th.endTime = new Date( et); ! return offset; } |
|
From: Jan S. <st...@us...> - 2002-05-16 12:15:17
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions In directory usw-pr-cvs1:/tmp/cvs-serv31325 Modified Files: Bundle.properties Log Message: Internacionalization of listen and terminate actions. Index: Bundle.properties =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions/Bundle.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Bundle.properties 26 Feb 2002 00:47:03 -0000 1.3 --- Bundle.properties 16 May 2002 12:15:15 -0000 1.4 *************** *** 77,78 **** --- 77,86 ---- LBL_saveSnapshotAction=Save + + LBL_listenToConnection=Listen to Connection + + LBL_listenAction=Listen + + LBL_terminateAction=Terminate + + HINT_terminateAction=Terminates listening for the connection from the profiled process. |
|
From: Jan S. <st...@us...> - 2002-05-16 12:14:29
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions
In directory usw-pr-cvs1:/tmp/cvs-serv30990
Modified Files:
AttachPanel.java AttachAction.java
Log Message:
Attach panel generalized for both attach and listen connectors.
Index: AttachPanel.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions/AttachPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AttachPanel.java 14 Oct 2001 22:17:11 -0000 1.1.1.1
--- AttachPanel.java 16 May 2002 12:14:26 -0000 1.2
***************
*** 48,58 ****
/** Collection of JTextFields. */
private LinkedList fields=new LinkedList();
/**
* Creates new <code>AttachPanel</code>.
*/
! AttachPanel() {
transportCombo=new JComboBox();
! List cons=Bootstrap.virtualMachineManager().connectors(Connector.ATTACHING_CONNECTOR);
Iterator iter=cons.iterator();
while (iter.hasNext()) {
--- 48,64 ----
/** Collection of JTextFields. */
private LinkedList fields=new LinkedList();
+ /** Connector mask */
+ private int mask;
/**
* Creates new <code>AttachPanel</code>.
+ *
+ * @param mask mask determining connectors that should be shown
+ * in the panel.
*/
! AttachPanel(int mask) {
! this.mask=mask;
transportCombo=new JComboBox();
! List cons=Bootstrap.virtualMachineManager().connectors(mask);
Iterator iter=cons.iterator();
while (iter.hasNext()) {
***************
*** 154,157 ****
--- 160,184 ----
return new Session(vm, true, name.deleteCharAt(name.length()-1).toString());
}
+
+ /**
+ * Returns name based on the entered values.
+ *
+ * @return name based on the entered values.
+ */
+ public String name() {
+ Connector connector=(Connector)connectors.get(transportCombo.getSelectedIndex());
+ Map args=connector.defaultArguments();
+ List keys=new ArrayList(args.keySet());
+ Iterator values=fields.iterator();
+ StringBuffer name=new StringBuffer();
+ for (int i=0; i<keys.size(); i++) {
+ Object key=keys.get(i);
+ Connector.Argument arg=(Connector.Argument)args.get(key);
+ JTextField field=(JTextField)values.next();
+ String text=field.getText();
+ name.append(text).append(":");
+ }
+ return name.deleteCharAt(name.length()-1).toString();
+ }
}
***************
*** 159,162 ****
--- 186,192 ----
/*
* $Log$
+ * Revision 1.2 2002/05/16 12:14:26 stolis
+ * Attach panel generalized for both attach and listen connectors.
+ *
* Revision 1.1.1.1 2001/10/14 22:17:11 stolis
* The very first version of profiler module.
Index: AttachAction.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions/AttachAction.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AttachAction.java 14 Oct 2001 22:15:29 -0000 1.1.1.1
--- AttachAction.java 16 May 2002 12:14:26 -0000 1.2
***************
*** 52,56 ****
*/
public void performAction() {
! panel=new AttachPanel();
DialogDescriptor descr = new DialogDescriptor (
panel,
--- 52,56 ----
*/
public void performAction() {
! panel=new AttachPanel(Connector.ATTACHING_CONNECTOR);
DialogDescriptor descr = new DialogDescriptor (
panel,
***************
*** 106,109 ****
--- 106,112 ----
/*
* $Log$
+ * Revision 1.2 2002/05/16 12:14:26 stolis
+ * Attach panel generalized for both attach and listen connectors.
+ *
* Revision 1.1.1.1 2001/10/14 22:15:29 stolis
* The very first version of profiler module.
|
|
From: Jan S. <st...@us...> - 2002-05-16 12:11:46
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions In directory usw-pr-cvs1:/tmp/cvs-serv30326 Added Files: ConListenerCookie.java Log Message: Cookie for listener node. --- NEW FILE: ConListenerCookie.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 org.openide.nodes.Node; /** * Cookie for connection listener. * * @author Jan Stola */ public interface ConListenerCookie extends Node.Cookie { /** * Terminates listening to the connection from the profiled process. */ public void terminate(); } /* * $Log: ConListenerCookie.java,v $ * Revision 1.1 2002/05/16 12:11:42 stolis * Cookie for listener node. * */ |
|
From: Jan S. <st...@us...> - 2002-05-16 12:11:02
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions In directory usw-pr-cvs1:/tmp/cvs-serv30164 Added Files: TerminateListenerAction.java ListenAction.java Log Message: Listen and terminate listener actions. --- NEW FILE: TerminateListenerAction.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.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.actions.CookieAction; /** * Action that terminates listening for a connection * from a profiled process. * * @author Jan Stola */ public class TerminateListenerAction extends CookieAction { protected Class[] cookieClasses() { return new Class[]{ConListenerCookie.class}; } protected int mode() { return MODE_ALL; } protected void performAction(Node[] nodes) { for (int i=0; i<nodes.length; i++) { ConListenerCookie cookie=(ConListenerCookie)nodes[i].getCookie(ConListenerCookie.class); cookie.terminate(); } } public String getName() { return NbBundle.getMessage(TerminateListenerAction.class, "LBL_terminateAction"); } protected String iconResource() { return "/net/sourceforge/javaprofiler/module/resources/TerminateActionIcon.gif"; } public HelpCtx getHelpCtx() { return new HelpCtx(TerminateListenerAction.class); } protected void initialize() { super.initialize(); putProperty(Action.SHORT_DESCRIPTION, NbBundle.getMessage(TerminateListenerAction.class, "HINT_terminateAction")); } } /* * $Log: TerminateListenerAction.java,v $ * Revision 1.1 2002/05/16 12:11:00 stolis * Listen and terminate listener actions. * */ --- NEW FILE: ListenAction.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 java.awt.Dialog; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import org.openide.TopManager; import org.openide.DialogDescriptor; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.actions.CallableSystemAction; import net.sourceforge.javaprofiler.jpi.Bootstrap; import net.sourceforge.javaprofiler.jpi.connect.Connector; import net.sourceforge.javaprofiler.jpi.connect.ConnectingException; import net.sourceforge.javaprofiler.module.data.Session; import net.sourceforge.javaprofiler.module.data.ConListener; import net.sourceforge.javaprofiler.module.data.ProfilerData; /** * Action that performes listening for the connection from the profiled process. * * @author Jan Stola */ public class ListenAction extends CallableSystemAction { /** Listen to connection dialog. */ Dialog dialog; /** Inner pane of the dialog. */ AttachPanel panel; /** * Displays listen to connection dialog. */ public void performAction() { panel=new AttachPanel(Connector.LISTENING_CONNECTOR); DialogDescriptor descr = new DialogDescriptor ( panel, NbBundle.getBundle(ListenAction.class).getString("LBL_listenToConnection"), true, // modal new ListenListener() ); dialog=TopManager.getDefault().createDialog(descr); dialog.show(); } public String getName() { return NbBundle.getMessage(ListenAction.class, "LBL_listenAction"); } protected String iconResource() { return "/net/sourceforge/javaprofiler/module/resources/ListenActionIcon.gif"; } public HelpCtx getHelpCtx() { return new HelpCtx (ListenAction.class); } /** * Listener for the listen to connection dialog. */ private class ListenListener implements ActionListener { /** * Attaches to the profiled process. * * @param event ActionEvent from the Attach to VM dialog. */ public void actionPerformed(ActionEvent event) { if (event.getSource().equals(DialogDescriptor.OK_OPTION)) { // PENDING // switch workspace final String name=panel.name(); new Thread(new Runnable() { public void run() { ConListener conLis=null; try { conLis=new ConListener(name, Thread.currentThread()); ProfilerData.getData().addConListener(conLis); Session session=panel.connect(); ProfilerData.getData().removeConListener(conLis); ProfilerData.getData().addSession(session); panel=null; } catch (ConnectingException e) { ProfilerData.getData().removeConListener(conLis); TopManager.getDefault().notifyException(e); } } }).start(); } dialog.setVisible(false); dialog.dispose(); } } } /* * $Log: ListenAction.java,v $ * Revision 1.1 2002/05/16 12:11:00 stolis * Listen and terminate listener actions. * */ |
|
From: Jan S. <st...@us...> - 2002-05-16 12:08:02
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv27046
Modified Files:
Bundle.properties
Log Message:
Internacionalization of listener node.
Index: Bundle.properties
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/Bundle.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Bundle.properties 20 Apr 2002 10:33:29 -0000 1.4
--- Bundle.properties 16 May 2002 12:00:42 -0000 1.5
***************
*** 70,71 ****
--- 70,79 ----
LBL_editorWindow=Source Editor
+
+ LBL_listenerNode=Listener on port {0}
+
+ HINT_listenerNode=Listener for a connection from a profiled process.
+
+ LBL_listenerLocation=Location
+
+ HINT_listenerLocation=Location on which the listener listens for connections.
|
|
From: Jan S. <st...@us...> - 2002-05-16 12:05:39
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data
In directory usw-pr-cvs1:/tmp/cvs-serv28552
Modified Files:
ProfilerData.java
Log Message:
Listeners added to the profiler data.
Index: ProfilerData.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data/ProfilerData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ProfilerData.java 26 Feb 2002 00:51:21 -0000 1.3
--- ProfilerData.java 16 May 2002 12:05:32 -0000 1.4
***************
*** 41,44 ****
--- 41,46 ----
/** List of Snapshots. */
private List snapshots;
+ /** List of connection listeners. */
+ private List listeners;
/** Sigleton instance of this class. */
private static ProfilerData data;
***************
*** 53,56 ****
--- 55,59 ----
sessions=new LinkedList();
snapshots=new LinkedList();
+ listeners=new LinkedList();
current=-1;
}
***************
*** 165,168 ****
--- 168,200 ----
return new LinkedList(snapshots);
}
+
+ /**
+ * Adds listener to the list of connection listeners.
+ *
+ * @param listener added listener.
+ */
+ public void addConListener(ConListener listener) {
+ listeners.add(listener);
+ refreshSessions();
+ }
+
+ /**
+ * Removes listener from the list of connection listeners.
+ *
+ * @param listener removed listener.
+ */
+ public void removeConListener(ConListener listener) {
+ listeners.remove(listener);
+ refreshSessions();
+ }
+
+ /**
+ * Returns <code>List</code> of connection listeners.
+ *
+ * @return <code>List</code> of <code>ConListener</code> objects.
+ */
+ public List listeners() {
+ return new LinkedList(listeners);
+ }
}
***************
*** 170,173 ****
--- 202,208 ----
/*
* $Log$
+ * Revision 1.4 2002/05/16 12:05:32 stolis
+ * Listeners added to the profiler data.
+ *
* Revision 1.3 2002/02/26 00:51:21 stolis
* RefreshSessions method made public.
|
|
From: Jan S. <st...@us...> - 2002-05-16 12:04:49
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data In directory usw-pr-cvs1:/tmp/cvs-serv28344 Added Files: ConListener.java Log Message: Connection listener. --- NEW FILE: ConListener.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.data; /** * Listener for a connection from a profiler process. * * @author Jan Stola */ public class ConListener { /** Location where this listener listens to the process. */ private String location; /** Thread that listens to the connection. */ private Thread thread; /** * Creates new <code>ConListener</code>. * * @param port port where this listener listens to the process. * @param thread thread that listens to the connection. */ public ConListener(String location, Thread thread) { this.location=location; this.thread=thread; } /** * Returns location where this listener listens to the process. * * @return location where this listener listens to the process. */ public String getLocation() { return location; } /** * Terminates the listening. */ public void terminate() { thread.interrupt(); } } /* * $Log: ConListener.java,v $ * Revision 1.1 2002/05/16 12:04:45 stolis * Connection listener. * */ |
|
From: Jan S. <st...@us...> - 2002-05-16 11:59:47
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv26649
Modified Files:
SessionsNode.java
Log Message:
Listener nodes added under sessions node.
Index: SessionsNode.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/SessionsNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SessionsNode.java 26 Feb 2002 00:54:26 -0000 1.3
--- SessionsNode.java 16 May 2002 11:59:44 -0000 1.4
***************
*** 32,35 ****
--- 32,36 ----
import net.sourceforge.javaprofiler.module.data.Session;
import net.sourceforge.javaprofiler.module.data.Snapshot;
+ import net.sourceforge.javaprofiler.module.data.ConListener;
/**
***************
*** 78,84 ****
// key is Session
return new Node[]{new SessionNode((Session)key)};
! } else {
// key is Snapshot
return new Node[]{new SnapshotNode((Snapshot)key)};
}
}
--- 79,88 ----
// key is Session
return new Node[]{new SessionNode((Session)key)};
! } else if (key instanceof Snapshot) {
// key is Snapshot
return new Node[]{new SnapshotNode((Snapshot)key)};
+ } else {
+ // key is ConListener
+ return new Node[]{new ListenerNode((ConListener)key)};
}
}
***************
*** 88,91 ****
--- 92,96 ----
Collection keySet=data.sessions();
keySet.addAll(data.snapshots());
+ keySet.addAll(data.listeners());
setKeys(keySet);
}
***************
*** 97,100 ****
--- 102,108 ----
/*
* $Log$
+ * Revision 1.4 2002/05/16 11:59:44 stolis
+ * Listener nodes added under sessions node.
+ *
* Revision 1.3 2002/02/26 00:54:26 stolis
* CanCopy method should return false for this node.
|
|
From: Jan S. <st...@us...> - 2002-05-16 11:58:48
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes In directory usw-pr-cvs1:/tmp/cvs-serv26396 Added Files: ListenerNode.java Log Message: Listener node class. --- NEW FILE: ListenerNode.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.nodes; import java.util.*; import java.text.MessageFormat; import org.openide.TopManager; import org.openide.actions.*; import org.openide.nodes.*; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; import net.sourceforge.javaprofiler.module.actions.*; import net.sourceforge.javaprofiler.module.data.ConListener; import net.sourceforge.javaprofiler.module.data.ProfilerData; /** * Node for connection listener. * * @author Jan Stola */ public class ListenerNode extends AbstractNode implements ConListenerCookie { private ConListener listener; private ResourceBundle bundle=NbBundle.getBundle(ListenerNode.class); public ListenerNode(ConListener listener) { super(Children.LEAF); this.listener=listener; setIconBase("/net/sourceforge/javaprofiler/module/resources/ListenerNodeIcon"); String messageFormat=bundle.getString("LBL_listenerNode"); setDisplayName(MessageFormat.format(messageFormat, new Object[]{new Integer(listener.getLocation())})); setShortDescription(bundle.getString("HINT_listenerNode")); getCookieSet().add(this); } protected SystemAction[] createActions() { return new SystemAction[] { SystemAction.get(TerminateListenerAction.class), null, SystemAction.get(PropertiesAction.class) }; } public HelpCtx getHelpCtx() { return new HelpCtx(ListenerNode.class); } protected Sheet createSheet() { Sheet sheet=super.createSheet(); Sheet.Set props=sheet.get(Sheet.PROPERTIES); if (props==null) { props=Sheet.createPropertiesSet(); sheet.put(props); } props.put(new PropertySupport.ReadOnly("port", String.class, bundle.getString("LBL_listenerLocation"), bundle.getString("HINT_listenerLocation")) { public Object getValue() { return new Integer(listener.getLocation()); } }); return sheet; } public boolean canCopy() { return false; } /** * Terminates listening to the connection from the profiled process. */ public void terminate() { listener.terminate(); ProfilerData.getData().removeConListener(listener); } } /* * $Log: ListenerNode.java,v $ * Revision 1.1 2002/05/16 11:58:45 stolis * Listener node class. * */ |
|
From: Jan S. <st...@us...> - 2002-05-16 11:57:26
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources
In directory usw-pr-cvs1:/tmp/cvs-serv26024
Modified Files:
mf-layer.xml
Log Message:
Listen action added to layer.
Index: mf-layer.xml
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/mf-layer.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mf-layer.xml 20 Apr 2002 10:44:05 -0000 1.3
--- mf-layer.xml 16 May 2002 11:57:23 -0000 1.4
***************
*** 27,30 ****
--- 27,31 ----
<folder name="Profiler">
<file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
+ <file name="net-sourceforge-javaprofiler-module-actions-ListenAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance" />
***************
*** 45,49 ****
<attr name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance/net-sourceforge-javaprofiler-module-actions-AttachAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-AttachAction.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" />
--- 46,52 ----
<attr name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance/net-sourceforge-javaprofiler-module-actions-AttachAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance/net-sourceforge-javaprofiler-module-actions-ListenAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-ListenAction.instance" />
! <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" />
***************
*** 85,89 ****
<attr name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance/net-sourceforge-javaprofiler-module-actions-AttachAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-AttachAction.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" />
--- 88,94 ----
<attr name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance/net-sourceforge-javaprofiler-module-actions-AttachAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance/net-sourceforge-javaprofiler-module-actions-ListenAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-ListenAction.instance" />
! <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" />
|
|
From: Jan S. <st...@us...> - 2002-05-16 11:56:27
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources In directory usw-pr-cvs1:/tmp/cvs-serv25801 Added Files: ListenerNodeIcon32.gif ListenerNodeIcon.gif Log Message: Icons for listener node added. --- NEW FILE: ListenerNodeIcon32.gif --- GIF89a ~H,TVmh 9 b-r*UG4 4 9 ]:z¬* g«3¢¤¯¹<µÀ®i&Æ& ÉÊËÌ --- NEW FILE: ListenerNodeIcon.gif --- GIF89a !Å+J£E 'üèð 'En\0 |
|
From: Jan S. <st...@us...> - 2002-05-16 11:56:02
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources In directory usw-pr-cvs1:/tmp/cvs-serv25705 Added Files: TerminateActionIcon.gif ListenActionIcon.gif Log Message: Icons for terminate and listen actions added. --- NEW FILE: TerminateActionIcon.gif --- GIF89a Å×@TCQcq=fïtBN8X«gËD --- NEW FILE: ListenActionIcon.gif --- GIF89a !Å+J£E 'üèð 'En\0 |
