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: Lukas P. <pe...@us...> - 2002-07-26 09:38:23
|
Update of /cvsroot/javaprofiler/test/module
In directory usw-pr-cvs1:/tmp/cvs-serv14675
Modified Files:
MainThreads.java
Log Message:
visually changed
Index: MainThreads.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/module/MainThreads.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MainThreads.java 16 Jul 2002 22:15:48 -0000 1.2
--- MainThreads.java 26 Jul 2002 09:38:19 -0000 1.3
***************
*** 1,100 ****
! //package net.sourceforge.javaprofiler.module.views;
!
! import javax.swing.*;
! import java.awt.*;
! import java.awt.event.*;
! import java.util.Timer;
! import java.util.TimerTask;
!
! import net.sourceforge.javaprofiler.jpiimpl.commun.*;
! import net.sourceforge.javaprofiler.jpiimpl.realtime.*;
import net.sourceforge.javaprofiler.module.views.*;
!
!
! /** Example of using TimeSeriesGraph to show number of running threads.
! * Please supply the name of profiled computer as a command-line parameter.
! * Default: localhost
! * @author Lukas Petru
! */
! public class MainThreads
! {
! static TimeSeriesGraph component;
!
! public static void main (String[] args) {
! connectAndRun(args);
! }
!
! private static void launchGui (final ImageR image, final IProf iprof) {
! JFrame frame=new JFrame("Main");
! frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
! frame.addWindowListener(new WindowAdapter() {
! public void windowClosing(WindowEvent e) {
! iprof.stop();
! System.exit(0);
! }
! });
!
! component=new TimeSeriesGraph();
! component.setBorder(BorderFactory.createLineBorder(Color.yellow));
! component.setBackground(Color.white);
! frame.getContentPane().add(component, BorderLayout.NORTH);
!
! frame.pack();
! frame.show();
!
! // Using java.util.Timer instead that of swing, because we don't
! // want the task to run in the event-dispatching thread.
! Timer timer=new Timer();
! TimerTask task=new TimerTask() {
! public void run() {
! final TimeSeriesModel m=component.getModel();
! final int[] data=m.copyData();
! // roll data
! System.arraycopy(data,1,data,0,data.length-1);
! image.refreshThreads();
! // get last value
! int val=image.getThreads().size();
! data[data.length-1]=val>0 ? val : 0;
!
! // set data in event-dispatching thread
! SwingUtilities.invokeLater(new Runnable() {
! public void run() {
! m.setData(data);
! }
! });
! }
! };
! timer.schedule(task, 1000, 500);
! }
!
! private static ImageR getImage(IProf iprof) {
! ImageR image=new ImageR(iprof, false);
! return image;
! }
!
! private static IProf connect (String hostName) {
! IProf iprof = new IProf(new CommunSetupSocket(CommunSetupSocket.
! CLIENT_MODE, hostName, 25595));
! try {
! iprof.run();
! return iprof;
! } catch (IProfException e) {
! System.out.println(e);
! return null;
! }
! }
!
! private static void connectAndRun(String[] arg) {
! String hostName = "localhost";
! if (arg.length >= 1)
! hostName = arg[0];
! System.out.println("host: " + hostName);
!
! IProf iprof = connect(hostName);
! if (iprof != null) {
! ImageR image=getImage(iprof);
! launchGui(image, iprof);
! }
! else System.out.println("Error connecting.");
! }
! }
--- 1,109 ----
! //package net.sourceforge.javaprofiler.module.views;
!
! import javax.swing.*;
! import javax.swing.event.ChangeListener;
! import javax.swing.event.ChangeEvent;
! import java.awt.*;
! import java.awt.event.*;
! import java.util.Timer;
! import java.util.TimerTask;
!
! import net.sourceforge.javaprofiler.jpiimpl.commun.*;
! import net.sourceforge.javaprofiler.jpiimpl.realtime.*;
import net.sourceforge.javaprofiler.module.views.*;
!
! /** Example of using TimeSeriesGraph to show number of running threads.
! * Please supply the name of profiled computer as a command-line parameter.
! * Default: localhost
! * @author Lukas Petru
! */
! public class MainThreads
! {
! static TimeSeriesGraph component;
!
! public static void main (String[] args) {
! connectAndRun(args);
! }
!
! private static void launchGui (final ImageR image, final IProf iprof) {
! JFrame frame=new JFrame("Main");
! frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
! frame.addWindowListener(new WindowAdapter() {
! public void windowClosing(WindowEvent e) {
! iprof.stop();
! System.exit(0);
! }
! });
!
! component=new TimeSeriesGraph();
! component.setBorder(BorderFactory.createLineBorder(Color.yellow));
! frame.getContentPane().add(component, BorderLayout.NORTH);
!
! final TimeSeriesModel m=component.getModel();
! final JLabel label1=new JLabel("curr: 000");
! final JLabel label2=new JLabel("max: 000");
! m.addChangeListener(new ChangeListener() {
! public void stateChanged(ChangeEvent e) {
! label1.setText("curr: " + m.getLast());
! label2.setText("max: " + m.getMax());
! }
! });
! JPanel sPanel=new JPanel();
! sPanel.add(label2);
! sPanel.add(label1);
! frame.getContentPane().add(sPanel, BorderLayout.SOUTH);
!
! frame.pack();
! frame.show();
!
! // Using java.util.Timer instead that of swing, because we don't
! // want the task to run in the event-dispatching thread.
! Timer timer=new Timer();
! TimerTask task=new TimerTask() {
! public void run() {
! final TimeSeriesModel m=component.getModel();
! image.refreshThreads();
! // get last value
! final int val=image.getThreads().size();
! // set data in event-dispatching thread
! SwingUtilities.invokeLater(new Runnable() {
! public void run() {
! m.shift(val);
! }
! });
! }
! };
! timer.schedule(task, 1000, 500);
! }
!
! private static ImageR getImage(IProf iprof) {
! ImageR image=new ImageR(iprof, false);
! return image;
! }
!
! private static IProf connect (String hostName) {
! IProf iprof = new IProf(new CommunSetupSocket(CommunSetupSocket.
! CLIENT_MODE, hostName, 25595));
! try {
! iprof.run();
! return iprof;
! } catch (IProfException e) {
! System.out.println(e);
! return null;
! }
! }
!
! private static void connectAndRun(String[] arg) {
! String hostName = "localhost";
! if (arg.length >= 1)
! hostName = arg[0];
! System.out.println("host: " + hostName);
!
! IProf iprof = connect(hostName);
! if (iprof != null) {
! ImageR image=getImage(iprof);
! launchGui(image, iprof);
! }
! else System.out.println("Error connecting.");
! }
! }
|
|
From: Lukas P. <pe...@us...> - 2002-07-26 09:33:16
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views
In directory usw-pr-cvs1:/tmp/cvs-serv13413
Modified Files:
TimeSeriesGraph.java
Log Message:
removed JLabels
Index: TimeSeriesGraph.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/TimeSeriesGraph.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TimeSeriesGraph.java 15 Jul 2002 11:16:29 -0000 1.1
--- TimeSeriesGraph.java 26 Jul 2002 09:33:14 -0000 1.2
***************
*** 1,175 ****
! package net.sourceforge.javaprofiler.module.views;
!
! import javax.swing.*;
! import java.awt.*;
! import javax.swing.event.ChangeListener;
! import javax.swing.event.ChangeEvent;
!
! /** Draws values of a time series in a bar graph.
! * @author Lukas Petru
! */
! public class TimeSeriesGraph extends JComponent implements
! ChangeListener
! {
! /** The model that holds time series data. */
! private TimeSeriesModel model;
! /** This JLabel shows the maximum value of the graph. */
! private JLabel maximum;
! /** This is the maximum value of the graph. */
! private int maxValue;
! /** This JLabel shows the last value of the graph. */
! private JLabel current;
! /** This is the last value shown in the graph. */
! private int curValue;
!
! /** Constructs graph with default model. */
! public TimeSeriesGraph() {
! setPreferredSize(new Dimension(40,40));
! setOpaque(true);
! setModel(new TimeSeriesModel());
! maximum=new JLabel("00");
! add(maximum);
! maximum.setBackground(null);
! maximum.setOpaque(true);
! current=new JLabel("00");
! add(current);
! current.setBackground(null);
! current.setOpaque(true);
! }
!
! /** Sets a new model.
! */
! public void setModel(TimeSeriesModel seriesModel) {
! if (seriesModel==null)
! throw new RuntimeException("TimeSeriesModel must not be null");
!
! TimeSeriesModel oldModel = getModel();
! if (oldModel != null) {
! oldModel.removeChangeListener(this);
! }
!
! model=seriesModel;
! model.addChangeListener(this);
! }
!
! /** Returns current model. */
! public TimeSeriesModel getModel() {
! return model;
! }
!
! /** Used for notification of a model data change. Internal function,
! not to be called by end users.
! */
! public void stateChanged(ChangeEvent e) {
! repaint();
! }
!
! /** Revalidates Label position. Called in case of size change,
! border change or label text change. */
! private void revalidateLabel() {
! Insets insets = getInsets();
! int mw=getWidth() - insets.left - insets.right;
! int mh=getHeight() - insets.top - insets.bottom;
! // maximum
! Dimension size=maximum.getPreferredSize();
! int w=size.width;
! int h=size.height;
! if (w>mw) w=mw;
! if (h>mh) h=mh;
! maximum.setBounds(insets.left, insets.top, w, h);
! // current
! size=current.getPreferredSize();
! w=size.width;
! h=size.height;
! if (w>mw) w=mw;
! if (h>mh) h=mh;
! current.setBounds(getWidth()-insets.right-w, insets.top, w, h);
! }
!
! /* Provides hook for revalidateLabel. */
! public void revalidate() {
! revalidateLabel();
! super.revalidate();
! }
!
! /* Provides hook for revalidateLabel. */
! public void setBounds(int x, int y, int width, int height) {
! Rectangle old=getBounds();
! super.setBounds(x, y, width, height);
! if (! getBounds().equals(old))
! revalidateLabel();
! }
!
! /** Paints a bar graph. */
! protected void paintComponent(Graphics g) {
! // draw background (component is always opaque)
! super.paintComponent(g);
! g.setColor(getBackground());
! g.fillRect(0, 0, getWidth(), getHeight());
!
! // compute usable area
! Insets insets = getInsets();
! int currentWidth = getWidth() - insets.left - insets.right;
! int currentHeight = getHeight() - insets.top - insets.bottom;
! currentHeight -= current.getHeight();
! int top=insets.top;
! int left=insets.left;
!
! // draw horizontal line
! g.setColor(getForeground());
! int y1=insets.top + current.getHeight();
! g.drawLine(insets.left, y1, currentWidth, y1);
!
! // retrieve data
! int[] data=model.getData();
!
! // find largest value
! int max=1;
! for (int i=0; i<data.length; i++) {
! if (data[i] > max)
! max=data[i];
! if (data[i] < 0)
! throw new RuntimeException("Illegal value in TimeSeriesModel");
! }
! max=fineScale(max);
! if (maxValue != max) {
! maxValue=max;
! maximum.setText(String.valueOf(max));
! revalidateLabel();
! }
! int last=data[data.length-1];
! if (curValue != last) {
! curValue=last;
! current.setText(String.valueOf(last));
! revalidateLabel();
! }
!
! final int sCnt=data.length;
! if (sCnt==0)
! throw new RuntimeException(
! "Array has zero length in TimeSeriesModel.");
! // draw
! final int advance=(currentWidth+1) / sCnt;
! int columnW=advance-1;
! if (columnW<1) columnW=1;
! int columnH;
! int x=getWidth() - insets.right - sCnt*advance + 1;
! final int y=getHeight() - insets.bottom;
! for (int i=0; i<sCnt; i++) {
! columnH=data[i]*currentHeight/max;
! g.fillRect(x, y-columnH, columnW, columnH);
! x+=advance;
! }
! }
!
! /** Returns round number greater or equal to argument. */
! private int fineScale (int x) {
! int d=1;
! int i=x;
! while (i>=10) {
! i/=10;
! d*=10;
! }
! return (x+d-1)/d*d;
! }
! }
--- 1,120 ----
! package net.sourceforge.javaprofiler.module.views;
!
! import javax.swing.*;
! import java.awt.*;
! import javax.swing.event.ChangeListener;
! import javax.swing.event.ChangeEvent;
!
! /** Draws values of a time series in a bar graph.
! * @author Lukas Petru
! */
! public class TimeSeriesGraph extends JComponent implements
! ChangeListener
! {
! /** The model that holds time series data. */
! private TimeSeriesModel model;
!
! /** Constructs graph with default model. */
! public TimeSeriesGraph() {
! setPreferredSize(new Dimension(40,40));
! setOpaque(true);
! setModel(new TimeSeriesModel());
! }
!
! /** Sets a new model.
! */
! public void setModel(TimeSeriesModel seriesModel) {
! if (seriesModel==null)
! throw new RuntimeException("TimeSeriesModel must not be null");
!
! TimeSeriesModel oldModel = getModel();
! if (oldModel != null) {
! oldModel.removeChangeListener(this);
! }
!
! model=seriesModel;
! model.addChangeListener(this);
! }
!
! /** Returns current model. */
! public TimeSeriesModel getModel() {
! return model;
! }
!
! /** Used for notification of a model data change. Internal function,
! not to be called by end users.
! */
! public void stateChanged(ChangeEvent e) {
! repaint();
! }
!
! /** Paints a bar graph. */
! protected void paintComponent(Graphics g) {
! // draw background (component is always opaque)
! super.paintComponent(g);
! g.setColor(getBackground());
! g.fillRect(0, 0, getWidth(), getHeight());
!
! // compute usable area
! Insets insets = getInsets();
! int currentWidth = getWidth() - insets.left - insets.right;
! int currentHeight = getHeight() - insets.top - insets.bottom;
! int top=insets.top;
! int left=insets.left;
!
! // retrieve data
! int[] data=model.getData();
!
! // find largest value
! int max=model.getMax();
! for (int i=0; i<data.length; i++) {
! if (data[i] < 0)
! throw new RuntimeException("Illegal value in TimeSeriesModel");
! }
! max=fineScale(max);
!
! final int sCnt=data.length;
! if (sCnt==0)
! throw new RuntimeException(
! "Array has zero length in TimeSeriesModel.");
!
! // area width for graph w/o axes
! int areaMaxW=currentWidth-2;
! final int advance=(areaMaxW+1) / sCnt;
! int columnW=advance-1;
! if (columnW<1) columnW=1;
! int areaW=sCnt*advance - 1;
! int areaMaxH=currentHeight-2;
!
! // draw axes
! g.setColor(getForeground());
! int x0=insets.left + (areaMaxW-areaW)/2;
! int y0=getHeight()-1 - insets.bottom;
! g.drawLine(x0, y0-1, x0+areaW+2-1, y0-1);
! g.drawLine(x0+1, y0, x0+1, y0-(areaMaxH+2-1));
!
! // draw
! int columnH;
! int x=x0+2;
! final int y=y0 - 1;
! for (int i=0; i<sCnt; i++) {
! columnH=data[i]*areaMaxH/max;
! g.fillRect(x, y-columnH, columnW, columnH);
! x+=advance;
! }
! }
!
! /** Returns round number greater or equal to argument. */
! private int fineScale (int x) {
! if (x<=0)
! return 1;
! int d=1;
! int i=x;
! while (i>=10) {
! i/=10;
! d*=10;
! }
! // d is power of than <= x
! return (x+d-1)/d*d;
! }
! }
|
|
From: Lukas P. <pe...@us...> - 2002-07-26 09:32:44
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views
In directory usw-pr-cvs1:/tmp/cvs-serv13254
Modified Files:
TimeSeriesModel.java
Log Message:
added shift method
Index: TimeSeriesModel.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/TimeSeriesModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TimeSeriesModel.java 15 Jul 2002 11:16:29 -0000 1.1
--- TimeSeriesModel.java 26 Jul 2002 09:32:39 -0000 1.2
***************
*** 1,105 ****
! package net.sourceforge.javaprofiler.module.views;
!
! import javax.swing.event.EventListenerList;
! import javax.swing.event.ChangeListener;
! import javax.swing.event.ChangeEvent;
!
! /** Holds data of a time series. Data are stored in an <code>int</code> array.
! * @author Lukas Petru
! */
! public class TimeSeriesModel {
! /** Holds time series values. */
! private int[] data;
!
! private transient ChangeEvent changeEvent = null;
! private EventListenerList listenerList = new EventListenerList();
!
! public TimeSeriesModel() {
! // test data
! data=new int[20];
! for (int i=0; i<10; i++)
! data[i]=i;
! for (int i=10; i<20; i++)
! data[i]=20-i;
! }
!
! /** Sets new time series values. */
! public void setData(int[] series) {
! if (series==null)
! throw new IllegalArgumentException("null");
! data=series;
! fireStateChanged();
! }
!
! /** Returns current time series values. You must not modify the
! returned value. Returned value is not null.
! */
! public int[] getData() {
! return data;
! }
!
! /** Returns a copy of time series values. You can freely
! modify returned value.
! */
! public int[] copyData() {
! int[] r=new int[data.length];
! System.arraycopy(data, 0, r, 0, data.length);
! return r;
! }
!
! // event firing
!
! /**
! * Adds a <code>ChangeListener</code> to the TimeSeriesModel.
! *
! * @param l the listener to add
! */
! public void addChangeListener(ChangeListener l) {
! listenerList.add(ChangeListener.class, l);
! }
!
! /**
! * Removes a <code>ChangeListener</code> from the TimeSeriesModel.
! *
! * @param l the listener to remove
! */
! public void removeChangeListener(ChangeListener l) {
! listenerList.remove(ChangeListener.class, l);
! }
!
! /**
! * Returns an array of all the change listeners
! * registered on this <code>TimeSeriesModel</code>.
! *
! * @return all of this model's <code>ChangeListener</code>s
! * or an empty
! * array if no change listeners are currently registered
! */
! public ChangeListener[] getChangeListeners() {
! return (ChangeListener[])listenerList.getListeners(
! ChangeListener.class);
! }
!
! /**
! * Notifies all listeners that have registered interest for
! * notification on this event type. The event instance
! * is created lazily.
! *
! * @see EventListenerList
! */
! protected void fireStateChanged() {
! // Guaranteed to return a non-null array
! Object[] listeners = listenerList.getListenerList();
! // Process the listeners last to first, notifying
! // those that are interested in this event
! for (int i = listeners.length-2; i>=0; i-=2) {
! if (listeners[i]==ChangeListener.class) {
! // Lazily create the event:
! if (changeEvent == null)
! changeEvent = new ChangeEvent(this);
! ((ChangeListener)listeners[i+1]).stateChanged(changeEvent);
! }
! }
! }
!
}
--- 1,137 ----
! package net.sourceforge.javaprofiler.module.views;
!
! import javax.swing.event.EventListenerList;
! import javax.swing.event.ChangeListener;
! import javax.swing.event.ChangeEvent;
!
! /** Holds data of a time series. Data are stored in an <code>int</code> array.
! * @author Lukas Petru
! */
! public class TimeSeriesModel {
! /** Holds time series values. */
! private int[] data;
! /** Maximum value of the data. */
! private int max;
!
! private transient ChangeEvent changeEvent = null;
! private EventListenerList listenerList = new EventListenerList();
!
! public TimeSeriesModel() {
! // test data
! data=new int[20];
! for (int i=0; i<10; i++)
! data[i]=i;
! for (int i=10; i<20; i++)
! data[i]=20-i;
! recompute();
! }
!
! /** Shifts current values of time series by one position to left and adds new
! value to be the rightmost one.
! */
! public void shift(int addVal) {
! System.arraycopy(data, 1, data, 0, data.length-1);
! data[data.length-1]=addVal;
! recompute();
! fireStateChanged();
! }
!
! /** Sets new time series values to a copy of a given argument. */
! public void setData(int[] series) {
! if (series==null)
! throw new IllegalArgumentException("null");
! data=new int[series.length];
! System.arraycopy(series, 0, data, 0, series.length);
! recompute();
! fireStateChanged();
! }
!
! /** Returns current time series values. You must not modify the
! returned value. Returned value is not null.
! */
! public int[] getData() {
! return data;
! }
!
! /** Returns a copy of time series values. You can freely
! modify returned value.
! */
! public int[] copyData() {
! int[] r=new int[data.length];
! System.arraycopy(data, 0, r, 0, data.length);
! return r;
! }
!
! /** Returns value of the largest data sample. */
! public int getMax() {
! return max;
! }
!
! /** Returns value of the last (i.e. rightmost) data sample. */
! public int getLast() {
! return data[data.length-1];
! }
!
! /** Recalculates the max value. */
! private void recompute() {
! max = 0;
! for (int i=0; i<data.length; i++)
! if (data[i] > max) max=data[i];
! }
!
! // event firing
!
! /**
! * Adds a <code>ChangeListener</code> to the TimeSeriesModel.
! *
! * @param l the listener to add
! */
! public void addChangeListener(ChangeListener l) {
! listenerList.add(ChangeListener.class, l);
! }
!
! /**
! * Removes a <code>ChangeListener</code> from the TimeSeriesModel.
! *
! * @param l the listener to remove
! */
! public void removeChangeListener(ChangeListener l) {
! listenerList.remove(ChangeListener.class, l);
! }
!
! /**
! * Returns an array of all the change listeners
! * registered on this <code>TimeSeriesModel</code>.
! *
! * @return all of this model's <code>ChangeListener</code>s
! * or an empty
! * array if no change listeners are currently registered
! */
! public ChangeListener[] getChangeListeners() {
! return (ChangeListener[])listenerList.getListeners(
! ChangeListener.class);
! }
!
! /**
! * Notifies all listeners that have registered interest for
! * notification on this event type. The event instance
! * is created lazily.
! *
! * @see EventListenerList
! */
! protected void fireStateChanged() {
! // Guaranteed to return a non-null array
! Object[] listeners = listenerList.getListenerList();
! // Process the listeners last to first, notifying
! // those that are interested in this event
! for (int i = listeners.length-2; i>=0; i-=2) {
! if (listeners[i]==ChangeListener.class) {
! // Lazily create the event:
! if (changeEvent == null)
! changeEvent = new ChangeEvent(this);
! ((ChangeListener)listeners[i+1]).stateChanged(changeEvent);
! }
! }
! }
!
}
|
|
From: Pavel V. <va...@us...> - 2002-07-25 23:03:15
|
Update of /cvsroot/javaprofiler/test/module
In directory usw-pr-cvs1:/tmp/cvs-serv712
Modified Files:
TestAllocHistView.java
Log Message:
no message
Index: TestAllocHistView.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/module/TestAllocHistView.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** TestAllocHistView.java 24 Jul 2002 23:58:41 -0000 1.5
--- TestAllocHistView.java 25 Jul 2002 23:03:13 -0000 1.6
***************
*** 45,60 ****
/** Creates a new instance of TestAllocHistView */
! public TestAllocHistView() {
try {
System.out.print( "Connecting ... \n" );
! vm = connect();
! System.out.print( "Preparing relatime ... \n" );
! image = vm.realtimeImage();
! ((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
! refreshTypes();
! refreshThread = new RefreshThread();
!
! //image = getSnapshot(vm);
System.out.print( "Creating window ... \n" );
--- 45,64 ----
/** Creates a new instance of TestAllocHistView */
! public TestAllocHistView( boolean useRealtime, boolean useShmem ) {
try {
System.out.print( "Connecting ... \n" );
! vm = connect( useShmem );
! if ( useRealtime ) {
! System.out.print( "Preparing realtime ... \n" );
! image = vm.realtimeImage();
! ((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
! refreshTypes();
! refreshThread = new RefreshThread();
! }
! else {
! System.out.print( "Creating snapshot ... \n" );
! image = getSnapshot(vm);
! }
System.out.print( "Creating window ... \n" );
***************
*** 140,157 ****
}
! private VirtualMachineRef connect() throws ConnectingException {
//try {
Bootstrap.virtualMachineManager().defaultConnector();
! /*Connector con = new SocketAttachConnector();
! Map args = con.defaultArguments();
! ((Connector.IntegerArgument) args.get("port")).setValue(25595);
! ((Connector.Argument) args.get("host")).setValue("localhost");
! return (new SocketAttachConnector()).connect( args );*/
!
! Connector con = new ShmemAttachConnector();
! Map args = con.defaultArguments();
! ((Connector.Argument) args.get("address")).setValue("com");
! return (new ShmemAttachConnector()).connect( args );
/*}
--- 144,164 ----
}
! private VirtualMachineRef connect( boolean useShmem ) throws ConnectingException {
//try {
Bootstrap.virtualMachineManager().defaultConnector();
! if ( !useShmem ) {
! Connector con = new SocketAttachConnector();
! Map args = con.defaultArguments();
! ((Connector.IntegerArgument) args.get("port")).setValue(25595);
! ((Connector.Argument) args.get("host")).setValue("localhost");
! return (new SocketAttachConnector()).connect( args );
! }
! else {
! Connector con = new ShmemAttachConnector();
! Map args = con.defaultArguments();
! ((Connector.Argument) args.get("address")).setValue("com");
! return (new ShmemAttachConnector()).connect( args );
! }
/*}
***************
*** 167,171 ****
public static void main( String[] arg) {
// let's run the test
! TestAllocHistView test = new TestAllocHistView();
test.show();
--- 174,178 ----
public static void main( String[] arg) {
// let's run the test
! TestAllocHistView test = new TestAllocHistView( true, true );
test.show();
|
|
From: Pavel V. <va...@us...> - 2002-07-25 23:02:09
|
Update of /cvsroot/javaprofiler/test/snapshot In directory usw-pr-cvs1:/tmp/cvs-serv402 Modified Files: run2.bat run1.bat Log Message: with shmem Index: run2.bat =================================================================== RCS file: /cvsroot/javaprofiler/test/snapshot/run2.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** run2.bat 25 Jul 2002 08:07:13 -0000 1.6 --- run2.bat 25 Jul 2002 23:02:06 -0000 1.7 *************** *** 3,6 **** SET CLASSPATH=%JAVA_HOME%\demo\jfc\SwingSet2\SwingSet2.jar;%CLASSPATH% set path=%JAVA_HOME%\bin;..\..\library\src2;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem SwingSet2 ! java -Xrun..\..\library\src\profiler\profiler:commun_type=socket SwingSet2 > out2.txt --- 3,6 ---- SET CLASSPATH=%JAVA_HOME%\demo\jfc\SwingSet2\SwingSet2.jar;%CLASSPATH% set path=%JAVA_HOME%\bin;..\..\library\src2;%path% ! java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem SwingSet2 ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=socket SwingSet2 > out2.txt Index: run1.bat =================================================================== RCS file: /cvsroot/javaprofiler/test/snapshot/run1.bat,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** run1.bat 25 Jul 2002 08:07:12 -0000 1.8 --- run1.bat 25 Jul 2002 23:02:06 -0000 1.9 *************** *** 3,6 **** SET CLASSPATH=%JAVA_HOME%\demo\jfc\Notepad\Notepad.jar;%CLASSPATH% set path=%JAVA_HOME%\bin;..\..\library\src2;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem Notepad ! java -Xrun..\..\library\src\profiler\profiler:commun_type=socket Notepad > out1.txt --- 3,6 ---- SET CLASSPATH=%JAVA_HOME%\demo\jfc\Notepad\Notepad.jar;%CLASSPATH% set path=%JAVA_HOME%\bin;..\..\library\src2;%path% ! java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem Notepad ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=socket Notepad > out1.txt |
|
From: Pavel V. <va...@us...> - 2002-07-25 23:01:36
|
Update of /cvsroot/javaprofiler/test/module In directory usw-pr-cvs1:/tmp/cvs-serv32689 Added Files: runhist.bat Log Message: with shmem --- NEW FILE: runhist.bat --- SET JAVA_HOME=d:\programs\j2sdk1.4.0 rem **************************** rem SET CLASSPATH=..\..\jpiimpl;..\..\interface;.\;%CLASSPATH% SET CLASSPATH=..\..\jpiimpl\jpiimpl.jar;..\..\module\javaprofiler.jar;.\;%CLASSPATH% set path=%JAVA_HOME%\bin;%path%;..\..\library\src2 java TestAllocHistView |
|
From: Pavel V. <va...@us...> - 2002-07-25 08:07:16
|
Update of /cvsroot/javaprofiler/test/snapshot In directory usw-pr-cvs1:/tmp/cvs-serv10986 Modified Files: run1.bat run2.bat run3.bat Log Message: shmem added Index: run1.bat =================================================================== RCS file: /cvsroot/javaprofiler/test/snapshot/run1.bat,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** run1.bat 13 Mar 2002 21:09:47 -0000 1.7 --- run1.bat 25 Jul 2002 08:07:12 -0000 1.8 *************** *** 2,6 **** rem ************************** SET CLASSPATH=%JAVA_HOME%\demo\jfc\Notepad\Notepad.jar;%CLASSPATH% ! set path=%JAVA_HOME%\bin;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem Notepad > out1.txt ! java -Xrun..\..\library\src\profiler\profiler:commun_type=socket Notepad > out1.txt \ No newline at end of file --- 2,6 ---- rem ************************** SET CLASSPATH=%JAVA_HOME%\demo\jfc\Notepad\Notepad.jar;%CLASSPATH% ! set path=%JAVA_HOME%\bin;..\..\library\src2;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem Notepad ! java -Xrun..\..\library\src\profiler\profiler:commun_type=socket Notepad > out1.txt Index: run2.bat =================================================================== RCS file: /cvsroot/javaprofiler/test/snapshot/run2.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** run2.bat 13 Mar 2002 21:09:47 -0000 1.5 --- run2.bat 25 Jul 2002 08:07:13 -0000 1.6 *************** *** 2,6 **** rem ************************** SET CLASSPATH=%JAVA_HOME%\demo\jfc\SwingSet2\SwingSet2.jar;%CLASSPATH% ! set path=%JAVA_HOME%\bin;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem SwingSet2 > out2.txt java -Xrun..\..\library\src\profiler\profiler:commun_type=socket SwingSet2 > out2.txt --- 2,6 ---- rem ************************** SET CLASSPATH=%JAVA_HOME%\demo\jfc\SwingSet2\SwingSet2.jar;%CLASSPATH% ! set path=%JAVA_HOME%\bin;..\..\library\src2;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem SwingSet2 java -Xrun..\..\library\src\profiler\profiler:commun_type=socket SwingSet2 > out2.txt Index: run3.bat =================================================================== RCS file: /cvsroot/javaprofiler/test/snapshot/run3.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** run3.bat 13 Mar 2002 21:09:47 -0000 1.3 --- run3.bat 25 Jul 2002 08:07:13 -0000 1.4 *************** *** 2,6 **** rem ************************** SET CLASSPATH=.;%CLASSPATH% ! set path=%JAVA_HOME%\bin;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem TestNoSwing > out3.txt java -Xrun..\..\library\src\profiler\profiler:commun_type=socket TestNoSwing > out3.txt --- 2,6 ---- rem ************************** SET CLASSPATH=.;%CLASSPATH% ! set path=%JAVA_HOME%\bin;..\..\library\src2;%path% ! rem java -Xrun..\..\library\src\profiler\profiler:commun_type=shmem TestNoSwing java -Xrun..\..\library\src\profiler\profiler:commun_type=socket TestNoSwing > out3.txt |
|
From: Pavel V. <va...@us...> - 2002-07-25 08:06:45
|
Update of /cvsroot/javaprofiler/test/snapshot In directory usw-pr-cvs1:/tmp/cvs-serv10841 Added Files: run1.sh run2.sh run3.sh runsnap.sh runsnap2.sh Log Message: scriptsf for linu --- NEW FILE: run1.sh --- #! /bin/sh export CLASSPATH=./Notepad.jar:$CLASSPATH export LD_LIBRARY_PATH=/home/pavel/Project/javaprof/library/src/profiler:/home/pavel/Project/javaprof/library/src2 #java -Xrunprofiler:commun_type=socket Notepad > out1.txt java -Xrunprofiler:commun_type=shmem Notepad --- NEW FILE: run2.sh --- #! /bin/sh export CLASSPATH=./SwingSet2.jar:$CLASSPATH export LD_LIBRARY_PATH=/home/pavel/Project/javaprof/library/src/profiler:/home/pavel/Project/javaprof/library/src2 java -Xrunprofiler:commun_type=shmem SwingSet2 #java -Xrunprofiler:commun_type=socket SwingSet2 > out2.txt --- NEW FILE: run3.sh --- #! /bin/sh export LD_LIBRARY_PATH=/home/pavel/Project/javaprof/library/src/profiler:/home/pavel/Project/javaprof/library/src2 #java -Xrunprofiler:commun_type=socket TestNoSwing > out3.txt java -Xrunprofiler:commun_type=shmem TestNoSwing --- NEW FILE: runsnap.sh --- #! /bin/sh export CLASSPATH=/home/pavel/Project/javaprof/jpiimpl/jpiimpl.jar:./:$CLASSPATH export LD_LIBRARY_PATH=/home/pavel/Project/javaprof/library/src/profiler:/home/pavel/Project/javaprof/library/src2 java TestSnap --- NEW FILE: runsnap2.sh --- #! /bin/sh export CLASSPATH=/home/pavel/Project/javaprof/jpiimpl/jpiimpl.jar:./:$CLASSPATH export LD_LIBRARY_PATH=/home/pavel/Project/javaprof/library/src/profiler:/home/pavel/Project/javaprof/library/src2 java TestSnap2 |
|
From: Pavel V. <va...@us...> - 2002-07-24 23:58:45
|
Update of /cvsroot/javaprofiler/test/module
In directory usw-pr-cvs1:/tmp/cvs-serv19421
Modified Files:
TestAllocHistView.java
Log Message:
shmem conector (for linux)
Index: TestAllocHistView.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/module/TestAllocHistView.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** TestAllocHistView.java 24 Jul 2002 22:30:40 -0000 1.4
--- TestAllocHistView.java 24 Jul 2002 23:58:41 -0000 1.5
***************
*** 63,67 ****
--- 63,69 ----
frame.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
+ System.out.print( "Disconecting ... " );
vm.dispose(); //necessary cleanup especialy for shmem conectors
+ System.out.println( "END" );
System.exit(0);
}
***************
*** 100,104 ****
refreshTypes();
try {
! sleep(500);
}
catch ( InterruptedException e ) {
--- 102,106 ----
refreshTypes();
try {
! sleep(1000);
}
catch ( InterruptedException e ) {
***************
*** 142,150 ****
Bootstrap.virtualMachineManager().defaultConnector();
! Connector con = new SocketAttachConnector();
Map args = con.defaultArguments();
((Connector.IntegerArgument) args.get("port")).setValue(25595);
((Connector.Argument) args.get("host")).setValue("localhost");
! return (new SocketAttachConnector()).connect( args );
/*}
--- 144,157 ----
Bootstrap.virtualMachineManager().defaultConnector();
! /*Connector con = new SocketAttachConnector();
Map args = con.defaultArguments();
((Connector.IntegerArgument) args.get("port")).setValue(25595);
((Connector.Argument) args.get("host")).setValue("localhost");
! return (new SocketAttachConnector()).connect( args );*/
!
! Connector con = new ShmemAttachConnector();
! Map args = con.defaultArguments();
! ((Connector.Argument) args.get("address")).setValue("com");
! return (new ShmemAttachConnector()).connect( args );
/*}
|
|
From: Pavel V. <va...@us...> - 2002-07-24 23:56:34
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views
In directory usw-pr-cvs1:/tmp/cvs-serv18608
Modified Files:
AllocHistogramTableModel.java
Log Message:
removed all table ofredrawin
Index: AllocHistogramTableModel.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/AllocHistogramTableModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AllocHistogramTableModel.java 24 Jul 2002 22:30:11 -0000 1.3
--- AllocHistogramTableModel.java 24 Jul 2002 23:56:29 -0000 1.4
***************
*** 116,124 ****
int index = allocStats.indexOf( event.getSource() );
//??do invokeLater
! //!!why this don't work
! //fireTableRowsUpdated(index, index);
! //use brutal method
! fireTableDataChanged();
}
}
--- 116,123 ----
int index = allocStats.indexOf( event.getSource() );
//??do invokeLater
! fireTableRowsUpdated(index, index);
! //brutal method
! //fireTableDataChanged();
}
}
|
|
From: Pavel V. <va...@us...> - 2002-07-24 22:30:43
|
Update of /cvsroot/javaprofiler/test/module
In directory usw-pr-cvs1:/tmp/cvs-serv18344
Modified Files:
TestAllocHistView.java
Log Message:
some prompts
Index: TestAllocHistView.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/module/TestAllocHistView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** TestAllocHistView.java 22 Jul 2002 23:39:48 -0000 1.3
--- TestAllocHistView.java 24 Jul 2002 22:30:40 -0000 1.4
***************
*** 47,52 ****
--- 47,54 ----
public TestAllocHistView() {
try {
+ System.out.print( "Connecting ... \n" );
vm = connect();
+ System.out.print( "Preparing relatime ... \n" );
image = vm.realtimeImage();
((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
***************
*** 56,59 ****
--- 58,62 ----
//image = getSnapshot(vm);
+ System.out.print( "Creating window ... \n" );
frame=new JFrame("Main");
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
***************
*** 92,95 ****
--- 95,99 ----
}
public void run() {
+ System.out.print( "Running ... \n" );
while( !stop ) {
((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
|
|
From: Pavel V. <va...@us...> - 2002-07-24 22:30:14
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views
In directory usw-pr-cvs1:/tmp/cvs-serv18167
Modified Files:
AllocHistogramTable.java AllocHistogramTableModel.java
Log Message:
using new interface hasType
Index: AllocHistogramTable.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/AllocHistogramTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AllocHistogramTable.java 22 Jul 2002 23:39:21 -0000 1.2
--- AllocHistogramTable.java 24 Jul 2002 22:30:11 -0000 1.3
***************
*** 60,63 ****
--- 60,65 ----
//string renderer with tooltips for log string
private class LongStringRenderer extends JLabel implements TableCellRenderer {
+ Font font;
+
public LongStringRenderer() {
super();
***************
*** 82,88 ****
setBackground(table.getBackground());
}
! //setFont(table.getFont());
! setFont( table.getFont().deriveFont( Font.BOLD ) );
!
if (hasFocus) {
setBorder( UIManager.getBorder("Table.focusCellHighlightBorder") );
--- 84,88 ----
setBackground(table.getBackground());
}
!
if (hasFocus) {
setBorder( UIManager.getBorder("Table.focusCellHighlightBorder") );
***************
*** 95,98 ****
--- 95,104 ----
setBorder(noFocusBorder);
}
+
+ //setFont(table.getFont());
+ if (font == null) {
+ font = table.getFont().deriveFont( Font.BOLD );
+ setFont( font );
+ }
setText( str );
***************
*** 132,138 ****
barMax = barMax * 2;
! //PENDING fire event
! //?invoke later
! //fireTableDataChanged();
}
--- 138,143 ----
barMax = barMax * 2;
! //FIXME??invoke later
! repaint();
}
Index: AllocHistogramTableModel.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/AllocHistogramTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AllocHistogramTableModel.java 22 Jul 2002 23:39:21 -0000 1.2
--- AllocHistogramTableModel.java 24 Jul 2002 22:30:11 -0000 1.3
***************
*** 58,71 ****
//PENDING listeners to other types
//parent.addChildListener( type, new HistogramChildrenListener );
-
- /*if ( ! (allocStats.get(0) instanceof TypeRef) ) {
- try {
- Method method_getName = allocStats.get(0).getClass()
- .getMethod( "getType", null );
- }
- catch (NoSuchMethodException e) {
- throw new RuntimeException( e.getMessage() + " requested method: getType()" );
- }
- }*/
}
--- 58,61 ----
***************
*** 81,105 ****
AllocStat alloc = (AllocStat) allocStats.get( rowIndex );
- //??FIXME
switch ( colIndex ) {
case 0: {
! //return ((HaveTypeRoot) alloc).getType().getName();
! //FIXME
! if ( alloc instanceof TypeRef ) {
! return ((TypeRef) alloc).getName();
! }
! //FIXME add interface with getType method
! /*try {
! return ((TypeRef) method_getName.invoke( alloc, null )).getName();
! }
! catch (SecurityException e) {
! throw new RuntimeException( e.getMessage() + " requested method: getType()" );
! }
! catch (IllegalAccessException e) {
! throw new RuntimeException( e.getMessage() + " requested method: getType()" );
! }
! catch (InvocationTargetException e) {
! throw new RuntimeException( e.getMessage() + " requested method: getType()" );
! }*/
}
case 1: {
--- 71,77 ----
AllocStat alloc = (AllocStat) allocStats.get( rowIndex );
switch ( colIndex ) {
case 0: {
! return ((HasType) alloc).getType().getName();
}
case 1: {
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv17795
Modified Files:
AllocThreadMethodData.java AllocThreadTraceData.java
AllocTraceData.java AllocTypeMethodData.java
AllocTypeThreadMethodData.java AllocTypeThreadTraceData.java
AllocTypeTraceData.java CPUThreadMethodData.java
CPUThreadTraceData.java CPUTraceData.java MethodData.java
MonThreadMethodData.java MonThreadTraceData.java
MonTraceData.java SnapshotImpl.java ThreadData.java
TypeData.java
Log Message:
implements new interfaces for getting roots and info
Index: AllocThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadMethodData.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** AllocThreadMethodData.java 12 Jun 2002 22:00:27 -0000 1.18
--- AllocThreadMethodData.java 24 Jul 2002 22:29:21 -0000 1.19
***************
*** 94,112 ****
}
! // ---------- return parents
! /**
! * Returns allocation data for this thread.
*
! * @return allocation data for this thread.
! */
public ThreadRef getThread() {
return thread;
}
! /**
! * Returns allocation data for this method.
*
! * @return allocation data for this method.
*/
public MethodRef getMethod() {
--- 94,111 ----
}
! // ---------- return parents, roots
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public ThreadRef getThread() {
return thread;
}
! /*
! * Returns Method root which this instance belongs to.
*
! *@return MethodRef which this instance belongs to.
*/
public MethodRef getMethod() {
***************
*** 114,117 ****
--- 113,125 ----
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
+
// ---------- return child Lists
***************
*** 211,214 ****
--- 219,225 ----
/*
* $Log$
+ * Revision 1.19 2002/07/24 22:29:21 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.18 2002/06/12 22:00:27 vachis
* add/removeChildListeners - param String changed to int
Index: AllocThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadTraceData.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** AllocThreadTraceData.java 12 Jun 2002 22:00:27 -0000 1.18
--- AllocThreadTraceData.java 24 Jul 2002 22:29:21 -0000 1.19
***************
*** 84,88 ****
}
! // ---------- return parents
/**
--- 84,88 ----
}
! // ---------- return parents, roots
/**
***************
*** 95,116 ****
}
! /**
! * Returns allocation data for this trace.
*
! * @return allocation data for this trace.
! */
public AllocTraceRef getAllocTrace() {
return location;
}
! /**
! * Returns allocation data for this thread.
*
! * @return allocation data for this thread.
! */
public ThreadRef getThread() {
return getAllocThreadMethod().getThread();
}
// ---------- return child Lists
--- 95,123 ----
}
! /** Returns AllocTrace root which this instance belongs to.
*
! * @return AllocTraceRef root which this instance belongs to.
! */
public AllocTraceRef getAllocTrace() {
return location;
}
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public ThreadRef getThread() {
return getAllocThreadMethod().getThread();
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getAllocTrace();
+ }
+
// ---------- return child Lists
***************
*** 183,186 ****
--- 190,196 ----
/*
* $Log$
+ * Revision 1.19 2002/07/24 22:29:21 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.18 2002/06/12 22:00:27 vachis
* add/removeChildListeners - param String changed to int
Index: AllocTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTraceData.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** AllocTraceData.java 12 Jun 2002 22:00:28 -0000 1.22
--- AllocTraceData.java 24 Jul 2002 22:29:21 -0000 1.23
***************
*** 128,131 ****
--- 128,141 ----
}
+ // -------------- roots
+
+ /** Returns Location root which this instance belongs to.
+ *
+ *@return this
+ */
+ public LocationRef getLocation() {
+ return this;
+ }
+
// -------------- children lists getter methods
***************
*** 234,242 ****
public void removeChildrenListener(int type, ChildrenListener listener) {
}
!
}
/*
* $Log$
* Revision 1.22 2002/06/12 22:00:28 vachis
* add/removeChildListeners - param String changed to int
--- 244,255 ----
public void removeChildrenListener(int type, ChildrenListener listener) {
}
!
}
/*
* $Log$
+ * Revision 1.23 2002/07/24 22:29:21 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.22 2002/06/12 22:00:28 vachis
* add/removeChildListeners - param String changed to int
Index: AllocTypeMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeMethodData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AllocTypeMethodData.java 12 Jun 2002 22:00:28 -0000 1.8
--- AllocTypeMethodData.java 24 Jul 2002 22:29:22 -0000 1.9
***************
*** 98,107 ****
}
! // ---------- return parents
/**
! * Returns allocation data for this type.
*
! * @return allocation data for this type.
*/
public TypeRef getType() {
--- 98,107 ----
}
! // ---------- return parents, roots
/**
! * Returns Type root which this instance belongs to.
*
! *@return TypeRef root which this instance belongs to.
*/
public TypeRef getType() {
***************
*** 109,120 ****
}
! /**
! * Returns allocation data for this method.
*
! * @return allocation data for this method.
*/
public MethodRef getMethod() {
return location;
! }
// ---------- return child Lists
--- 109,129 ----
}
! /*
! * Returns Method which this instance belongs to.
*
! *@return MethodRef which this instance belongs to.
*/
public MethodRef getMethod() {
return location;
! }
!
! /*
! * Returns Location root which this instance belongs to.
! *
! *@return LocationRef which this instance belongs to.
! */
! public LocationRef getLocation() {
! return getMethod();
! }
// ---------- return child Lists
***************
*** 194,197 ****
--- 203,209 ----
/*
* $Log$
+ * Revision 1.9 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.8 2002/06/12 22:00:28 vachis
* add/removeChildListeners - param String changed to int
Index: AllocTypeThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeThreadMethodData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeThreadMethodData.java 12 Jun 2002 22:00:29 -0000 1.4
--- AllocTypeThreadMethodData.java 24 Jul 2002 22:29:22 -0000 1.5
***************
*** 152,168 ****
// ------------- roots
! /**
! * Returns allocation data for this thread (root object).
*
! * @return allocation data for this thread (root object).
! */
public ThreadRef getThread() {
return getAllocTypeThread().getThread();
}
! /**
! * Returns allocation data for this type (root object).
*
! * @return allocation data for this type (root object).
*/
public TypeRef getType() {
--- 152,167 ----
// ------------- roots
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public ThreadRef getThread() {
return getAllocTypeThread().getThread();
}
! /*
! * Returns Type root which this instance belongs to.
*
! *@return TypeRef which this instance belongs to.
*/
public TypeRef getType() {
***************
*** 170,177 ****
}
! /**
! * Returns allocation data for this method (root object).
*
! * @return allocation data for this method (root object).
*/
public MethodRef getMethod() {
--- 169,176 ----
}
! /*
! * Returns Method root which this instance belongs to.
*
! *@return MethodRef which this instance belongs to.
*/
public MethodRef getMethod() {
***************
*** 179,182 ****
--- 178,190 ----
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
+
public String toString() {
return getType() + "-" + getThread() + "-" + getMethod();
***************
*** 193,196 ****
--- 201,207 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.4 2002/06/12 22:00:29 vachis
* add/removeChildListeners - param String changed to int
Index: AllocTypeThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeThreadTraceData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AllocTypeThreadTraceData.java 30 May 2002 22:38:17 -0000 1.2
--- AllocTypeThreadTraceData.java 24 Jul 2002 22:29:22 -0000 1.3
***************
*** 109,138 ****
return threadTypeMethod.getAllocTypeThread();
}
!
! // ---------- return child Lists
!
// ------------- roots
! /**
! * Returns allocation data for this thread (root object).
*
! * @return allocation data for this thread (root object).
! */
public ThreadRef getThread() {
return getAllocTypeThread().getThread();
}
! /**
! * Returns allocation data for this type (root object).
*
! * @return allocation data for this type (root object).
! */
public TypeRef getType() {
return getAllocTypeThread().getType();
}
! /**
! * Returns allocation data for this trace (root object).
*
! * @return allocation data for this trace (root object).
*/
public AllocTraceRef getAllocTrace() {
--- 109,135 ----
return threadTypeMethod.getAllocTypeThread();
}
!
// ------------- roots
!
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public ThreadRef getThread() {
return getAllocTypeThread().getThread();
}
! /** Returns Type root which this instance belongs to.
*
! * @return TypeRef root which this instance belongs to.
! */
public TypeRef getType() {
return getAllocTypeThread().getType();
}
! /*
! * Returns AllocTrace root which this instance belongs to.
*
! *@return AllocTraceRef which this instance belongs to.
*/
public AllocTraceRef getAllocTrace() {
***************
*** 140,143 ****
--- 137,151 ----
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getAllocTrace();
+ }
+
+ // ---------- return child Lists
+
public String toString() {
return getType() + "-" + getThread() + "-" + getAllocTrace();
***************
*** 147,150 ****
--- 155,161 ----
/*
* $Log$
+ * Revision 1.3 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.2 2002/05/30 22:38:17 vachis
* changed interface to jpi
Index: AllocTypeTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeTraceData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AllocTypeTraceData.java 12 Jun 2002 22:00:29 -0000 1.8
--- AllocTypeTraceData.java 24 Jul 2002 22:29:22 -0000 1.9
***************
*** 94,106 ****
}
- /**
- * Returns allocation data for this type.
- *
- * @return allocation data for this type.
- */
- public TypeRef getType() {
- return typeMethod.getType();
- }
-
/**
* Returns allocation data for this trace.
--- 94,97 ----
***************
*** 112,115 ****
--- 103,125 ----
}
+ // -------------- parents, roots
+
+ /** Returns Type root which this instance belongs to.
+ *
+ * @return TypeRef root which this instance belongs to.
+ */
+ public TypeRef getType() {
+ return typeMethod.getType();
+ }
+
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getAllocTrace();
+ }
+
// ---------- return child Lists
***************
*** 159,162 ****
--- 169,175 ----
/*
* $Log$
+ * Revision 1.9 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.8 2002/06/12 22:00:29 vachis
* add/removeChildListeners - param String changed to int
Index: CPUThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUThreadMethodData.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** CPUThreadMethodData.java 12 Jun 2002 22:00:30 -0000 1.13
--- CPUThreadMethodData.java 24 Jul 2002 22:29:22 -0000 1.14
***************
*** 81,104 ****
}
! // ---------- return parents
! /**
! * Returns profiling data for this thread.
*
! * @return profiling data for this thread.
! */
public ThreadRef getThread() {
return thread;
}
! /**
! * Returns profiling data for this method.
*
! * @return profiling data for this method.
! */
public MethodRef getMethod() {
return location;
}
// ---------- return child Lists
--- 81,111 ----
}
! // ---------- return parents, roots
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public ThreadRef getThread() {
return thread;
}
! /** Returns Method root which this instance belongs to.
*
! * @return MethodRef root which this instance belongs to.
! */
public MethodRef getMethod() {
return location;
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
+
// ---------- return child Lists
***************
*** 167,170 ****
--- 174,180 ----
/*
* $Log$
+ * Revision 1.14 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.13 2002/06/12 22:00:30 vachis
* add/removeChildListeners - param String changed to int
Index: CPUThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUThreadTraceData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** CPUThreadTraceData.java 30 May 2002 22:38:17 -0000 1.9
--- CPUThreadTraceData.java 24 Jul 2002 22:29:22 -0000 1.10
***************
*** 65,69 ****
}
! // ---------- return parents
/**
--- 65,69 ----
}
! // ---------- return parents, roots
/**
***************
*** 76,84 ****
}
! /**
! * Returns profiling data for this trace.
*
! * @return profiling data for this trace.
! */
public CPUTraceRef getCPUTrace() {
return location;
--- 76,83 ----
}
! /** Returns CPUTrace root which this instance belongs to.
*
! * @return CPUTraceRef root which this instance belongs to.
! */
public CPUTraceRef getCPUTrace() {
return location;
***************
*** 86,98 ****
// ------------- roots
! /**
! * Returns allocation data for this thread (root object).
*
! * @return allocation data for this thread (root object).
! */
public ThreadRef getThread() {
return getCPUThreadMethod().getThread();
}
// ---------- return siblings
--- 85,106 ----
// ------------- roots
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public ThreadRef getThread() {
return getCPUThreadMethod().getThread();
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getCPUTrace();
+ }
+
+
// ---------- return siblings
***************
*** 125,128 ****
--- 133,139 ----
/*
* $Log$
+ * Revision 1.10 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.9 2002/05/30 22:38:17 vachis
* changed interface to jpi
Index: CPUTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/CPUTraceData.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** CPUTraceData.java 12 Jun 2002 22:00:30 -0000 1.16
--- CPUTraceData.java 24 Jul 2002 22:29:22 -0000 1.17
***************
*** 115,118 ****
--- 115,128 ----
}
+ // -------------- roots
+
+ /** Returns Location root which this instance belongs to.
+ *
+ *@return this
+ */
+ public LocationRef getLocation() {
+ return this;
+ }
+
// -------------- children lists getter methods
***************
*** 192,200 ****
public void removeChildrenListener(int type, ChildrenListener listener) {
}
!
}
/*
* $Log$
* Revision 1.16 2002/06/12 22:00:30 vachis
* add/removeChildListeners - param String changed to int
--- 202,213 ----
public void removeChildrenListener(int type, ChildrenListener listener) {
}
!
}
/*
* $Log$
+ * Revision 1.17 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.16 2002/06/12 22:00:30 vachis
* add/removeChildListeners - param String changed to int
Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** MethodData.java 12 Jun 2002 22:00:30 -0000 1.19
--- MethodData.java 24 Jul 2002 22:29:22 -0000 1.20
***************
*** 239,242 ****
--- 239,259 ----
return vmImage;
}
+
+ // -------------- roots
+
+ /** Returns Location root which this instance belongs to.
+ *
+ *@return this
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
+
+
+ /** Returns methods which this instance belongs to. (this)
+ */
+ public MethodRef getMethod() {
+ return this;
+ }
// -------------- children lists getter methods
***************
*** 395,398 ****
--- 412,416 ----
public void removeChildrenListener(int type, ChildrenListener listener) {
}
+
}
***************
*** 400,403 ****
--- 418,424 ----
/*
* $Log$
+ * Revision 1.20 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.19 2002/06/12 22:00:30 vachis
* add/removeChildListeners - param String changed to int
Index: MonThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonThreadMethodData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** MonThreadMethodData.java 12 Jun 2002 22:00:31 -0000 1.10
--- MonThreadMethodData.java 24 Jul 2002 22:29:22 -0000 1.11
***************
*** 82,105 ****
}
! // ---------- return parents
! /**
! * Returns profiling data for this thread.
*
! * @return profiling data for this thread.
! */
public ThreadRef getThread() {
return thread;
}
! /**
! * Returns profiling data for this method.
*
! * @return profiling data for this method.
! */
public MethodRef getMethod() {
return location;
}
// ---------- return child Lists
--- 82,112 ----
}
! // ---------- return parents, roots
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public ThreadRef getThread() {
return thread;
}
! /** Returns Method root which this instance belongs to.
*
! * @return MethodRef root which this instance belongs to.
! */
public MethodRef getMethod() {
return location;
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
+
// ---------- return child Lists
***************
*** 168,171 ****
--- 175,181 ----
/*
* $Log$
+ * Revision 1.11 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.10 2002/06/12 22:00:31 vachis
* add/removeChildListeners - param String changed to int
Index: MonThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonThreadTraceData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** MonThreadTraceData.java 30 May 2002 22:38:17 -0000 1.7
--- MonThreadTraceData.java 24 Jul 2002 22:29:22 -0000 1.8
***************
*** 68,91 ****
}
! // ---------- return parents
! /**
! * Returns profiling data for this thread and method.
*
! * @return profiling data for this thread and method.
! */
public MonThreadMethodRef getMonThreadMethod() {
return threadMethod;
}
! /**
! * Returns profiling data for this trace.
*
! * @return profiling data for this trace.
! */
public MonTraceRef getMonTrace() {
return location;
}
// ------------- roots
/**
--- 68,99 ----
}
! // ---------- return parents, roots
! /** Returns Thread root which this instance belongs to.
*
! * @return ThreadRef root which this instance belongs to.
! */
public MonThreadMethodRef getMonThreadMethod() {
return threadMethod;
}
! /** Returns Method root which this instance belongs to.
*
! * @return MethodRef root which this instance belongs to.
! */
public MonTraceRef getMonTrace() {
return location;
}
+ /*
+ * Returns Location root which this instance belongs to.
+ *
+ *@return LocationRef which this instance belongs to.
+ */
+ public LocationRef getLocation() {
+ return getMonTrace();
+ }
+
+
// ------------- roots
/**
***************
*** 127,130 ****
--- 135,141 ----
/*
* $Log$
+ * Revision 1.8 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.7 2002/05/30 22:38:17 vachis
* changed interface to jpi
Index: MonTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MonTraceData.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** MonTraceData.java 12 Jun 2002 22:00:31 -0000 1.14
--- MonTraceData.java 24 Jul 2002 22:29:22 -0000 1.15
***************
*** 115,118 ****
--- 115,129 ----
}
+
+ // -------------- roots
+
+ /** Returns Location root which this instance belongs to.
+ *
+ *@return this
+ */
+ public LocationRef getLocation() {
+ return this;
+ }
+
// -------------- children lists getter methods
***************
*** 192,196 ****
public void removeChildrenListener(int type, ChildrenListener listener) {
}
!
}
--- 203,207 ----
public void removeChildrenListener(int type, ChildrenListener listener) {
}
!
}
***************
*** 198,201 ****
--- 209,215 ----
/*
* $Log$
+ * Revision 1.15 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.14 2002/06/12 22:00:31 vachis
* add/removeChildListeners - param String changed to int
Index: SnapshotImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/SnapshotImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** SnapshotImpl.java 17 Jul 2002 21:37:10 -0000 1.27
--- SnapshotImpl.java 24 Jul 2002 22:29:22 -0000 1.28
***************
*** 386,389 ****
--- 386,391 ----
if ( haveSnapshot )
throw new RuntimeException( "Can't create Snapshot, it already exists!");
+
+ time = System.currentTimeMillis();
long start = System.currentTimeMillis();
***************
*** 1132,1135 ****
--- 1134,1140 ----
/*
* $Log$
+ * Revision 1.28 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.27 2002/07/17 21:37:10 vachis
* fixed exception handling
Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** ThreadData.java 12 Jun 2002 22:00:31 -0000 1.23
--- ThreadData.java 24 Jul 2002 22:29:22 -0000 1.24
***************
*** 289,292 ****
--- 289,302 ----
}
+ // -------------- roots
+
+ /** Returns Thread root which this instance belongs to.
+ *
+ *@return this
+ */
+ public ThreadRef getThread() {
+ return this;
+ }
+
// -------------- children lists getter methods
***************
*** 524,527 ****
--- 534,540 ----
/*
* $Log$
+ * Revision 1.24 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.23 2002/06/12 22:00:31 vachis
* add/removeChildListeners - param String changed to int
Index: TypeData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/TypeData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** TypeData.java 12 Jun 2002 22:00:32 -0000 1.4
--- TypeData.java 24 Jul 2002 22:29:22 -0000 1.5
***************
*** 188,191 ****
--- 188,201 ----
}
+ // -------------- roots
+
+ /** Returns Type root which this instance belongs to.
+ *
+ *@return this
+ */
+ public TypeRef getType() {
+ return this;
+ }
+
// -------------- children lists getter methods
***************
*** 289,292 ****
--- 299,305 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:29:22 vachis
+ * implements new interfaces for getting roots and info
+ *
* Revision 1.4 2002/06/12 22:00:32 vachis
* add/removeChildListeners - param String changed to int
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime
In directory usw-pr-cvs1:/tmp/cvs-serv17585
Modified Files:
AllocThreadMethodR.java AllocThreadTraceR.java
AllocTraceR.java AllocTypeMethodR.java
AllocTypeThreadMethodR.java AllocTypeThreadR.java
AllocTypeThreadTraceR.java AllocTypeTraceR.java ClassR.java
CPUThreadMethodR.java CPUThreadTraceR.java CPUTraceR.java
DataR.java ImageR.java MethodR.java MonThreadMethodR.java
MonThreadTraceR.java MonTraceR.java ThreadGroupR.java
ThreadR.java TypeR.java
Log Message:
implements new interfaces for getting roots and info
Index: AllocThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadMethodR.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** AllocThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.11
--- AllocThreadMethodR.java 24 Jul 2002 22:29:03 -0000 1.12
***************
*** 133,138 ****
}
! // ---------- return parents
!
public ThreadRef getThread() {
needConstructed();
--- 133,139 ----
}
! // ---------- return parents, roots
! /** Returns TypeRef root of this object.
! */
public ThreadRef getThread() {
needConstructed();
***************
*** 140,148 ****
}
public MethodRef getMethod() {
needConstructed();
return location;
}
!
// ---------- return roots of this object
--- 141,156 ----
}
+
public MethodRef getMethod() {
needConstructed();
return location;
}
!
! /** Returns LocationRef root of this object.
! */
! public LocationRef getLocation() {
! return getMethod();
! }
!
// ---------- return roots of this object
***************
*** 165,169 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 173,177 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
***************
*** 313,317 ****
thread.refreshCPUThreadMethods();
List o=thread.getCPUThreadMethods();
! return (CPUThreadMethodRef) image.filterByLocation(o, getLocation());
}
--- 321,325 ----
thread.refreshCPUThreadMethods();
List o=thread.getCPUThreadMethods();
! return (CPUThreadMethodRef) image.filterByLocation(o, getLocationR());
}
***************
*** 322,326 ****
thread.refreshMonThreadMethods();
List o=thread.getMonThreadMethods();
! return (MonThreadMethodRef) image.filterByLocation(o, getLocation());
}
--- 330,334 ----
thread.refreshMonThreadMethods();
List o=thread.getMonThreadMethods();
! return (MonThreadMethodRef) image.filterByLocation(o, getLocationR());
}
Index: AllocThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadTraceR.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.9
--- AllocThreadTraceR.java 24 Jul 2002 22:29:03 -0000 1.10
***************
*** 120,124 ****
}
! // ---------- return parents
public AllocThreadMethodRef getAllocThreadMethod() {
--- 120,124 ----
}
! // ---------- return parents, roots
public AllocThreadMethodRef getAllocThreadMethod() {
***************
*** 127,130 ****
--- 127,132 ----
}
+ /** Returns ThreadRef root of this object.
+ */
public ThreadRef getThread() {
needConstructed();
***************
*** 136,140 ****
return location;
}
!
// ---------- return roots of this object
--- 138,147 ----
return location;
}
!
! /** Returns LocationRef root of this object.
! */
! public LocationRef getLocation() {
! return getAllocTrace();
! }
// ---------- return roots of this object
***************
*** 157,161 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 164,168 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
Index: AllocTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTraceR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocTraceR.java 22 Jul 2002 21:51:59 -0000 1.10
--- AllocTraceR.java 24 Jul 2002 22:29:03 -0000 1.11
***************
*** 200,203 ****
--- 200,210 ----
allocThreadTraces.size()-1}), listenersMap);
}
+
+ //-------------- roots
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return this;
+ }
// roots
***************
*** 220,224 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return this;
}
--- 227,231 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
return this;
}
Index: AllocTypeMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeMethodR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocTypeMethodR.java 22 Jul 2002 21:51:59 -0000 1.10
--- AllocTypeMethodR.java 24 Jul 2002 22:29:03 -0000 1.11
***************
*** 107,112 ****
}
! // ---------- return parents
public TypeRef getType() {
needConstructed();
--- 107,114 ----
}
! // ---------- return parents, roots
+ /** Returns TypeRef root of this object.
+ */
public TypeRef getType() {
needConstructed();
***************
*** 118,121 ****
--- 120,129 ----
return location;
}
+
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
// ---------- return roots of this object
***************
*** 139,143 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 147,151 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
Index: AllocTypeThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadMethodR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocTypeThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.10
--- AllocTypeThreadMethodR.java 24 Jul 2002 22:29:03 -0000 1.11
***************
*** 139,143 ****
--- 139,162 ----
return typeThread;
}
+
+ // ---------- roots
+ /** Returns TypeRef root of this object.
+ */
+ public TypeRef getType() {
+ return getTypeR();
+ }
+
+ /** Returns ThreadRef root of this object.
+ */
+ public ThreadRef getThread() {
+ return getThreadR();
+ }
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ needConstructed();
+ return location;
+ }
// ---------- return roots of this object
***************
*** 161,165 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 180,184 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
Index: AllocTypeThreadR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadR.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** AllocTypeThreadR.java 22 Jul 2002 21:51:59 -0000 1.11
--- AllocTypeThreadR.java 24 Jul 2002 22:29:03 -0000 1.12
***************
*** 140,144 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return null;
--- 140,144 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return null;
Index: AllocTypeThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadTraceR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AllocTypeThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.8
--- AllocTypeThreadTraceR.java 24 Jul 2002 22:29:03 -0000 1.9
***************
*** 127,130 ****
--- 127,152 ----
}
+ // ---------- roots
+ /** Returns TypeRef root of this object.
+ */
+ public TypeRef getType() {
+ needConstructed();
+ return type;
+ }
+
+ /** Returns ThreadRef root of this object.
+ */
+ public ThreadRef getThread() {
+ needConstructed();
+ return thread;
+ }
+
+ /** Returns Location root of this object.
+ */
+ public LocationRef getLocation() {
+ needConstructed();
+ return location;
+ }
+
// ---------- return roots of this object
***************
*** 148,152 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 170,174 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
Index: AllocTypeTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeTraceR.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocTypeTraceR.java 22 Jul 2002 21:51:59 -0000 1.10
--- AllocTypeTraceR.java 24 Jul 2002 22:29:03 -0000 1.11
***************
*** 119,123 ****
}
! // ---------- return parents
public AllocTypeMethodRef getAllocTypeMethod() {
--- 119,123 ----
}
! // ---------- return parents, roots
public AllocTypeMethodRef getAllocTypeMethod() {
***************
*** 126,129 ****
--- 126,131 ----
}
+ /** ReturnsTypeRef root of this object.
+ */
public TypeRef getType() {
needConstructed();
***************
*** 136,139 ****
--- 138,146 ----
}
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return getAllocTrace();
+ }
// ---------- return roots of this object
***************
*** 156,160 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 163,167 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
Index: ClassR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ClassR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ClassR.java 22 Jul 2002 21:51:59 -0000 1.7
--- ClassR.java 24 Jul 2002 22:29:03 -0000 1.8
***************
*** 180,184 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return null;
}
--- 180,184 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
return null;
}
Index: CPUThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadMethodR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** CPUThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.8
--- CPUThreadMethodR.java 24 Jul 2002 22:29:03 -0000 1.9
***************
*** 117,122 ****
}
! // ---------- return parents
public ThreadRef getThread() {
needConstructed();
--- 117,124 ----
}
! // ---------- return parents, roots
+ /** Returns ThreadRef root of this object.
+ */
public ThreadRef getThread() {
needConstructed();
***************
*** 129,132 ****
--- 131,139 ----
}
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
// ---------- return roots of this object
***************
*** 149,153 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 156,160 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
***************
*** 277,281 ****
thread.refreshAllocThreadMethods();
List o=thread.getAllocThreadMethods();
! return (AllocThreadMethodRef) image.filterByLocation(o, getLocation());
}
--- 284,288 ----
thread.refreshAllocThreadMethods();
List o=thread.getAllocThreadMethods();
! return (AllocThreadMethodRef) image.filterByLocation(o, getLocationR());
}
***************
*** 286,290 ****
thread.refreshMonThreadMethods();
List o=thread.getMonThreadMethods();
! return (MonThreadMethodRef) image.filterByLocation(o, getLocation());
}
--- 293,297 ----
thread.refreshMonThreadMethods();
List o=thread.getMonThreadMethods();
! return (MonThreadMethodRef) image.filterByLocation(o, getLocationR());
}
Index: CPUThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadTraceR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** CPUThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.7
--- CPUThreadTraceR.java 24 Jul 2002 22:29:03 -0000 1.8
***************
*** 106,109 ****
--- 106,111 ----
}
+ /** Returns TypeRef root of this object.
+ */
public ThreadRef getThread() {
needConstructed();
***************
*** 116,119 ****
--- 118,126 ----
}
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return getCPUTrace();
+ }
// ---------- return roots of this object
***************
*** 136,140 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 143,147 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
Index: CPUTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUTraceR.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** CPUTraceR.java 22 Jul 2002 21:51:59 -0000 1.9
--- CPUTraceR.java 24 Jul 2002 22:29:03 -0000 1.10
***************
*** 158,161 ****
--- 158,169 ----
}
+ //----------roots
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return this;
+ }
+
+
// roots
***************
*** 177,183 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return this;
}
// package / private
--- 185,192 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
return this;
}
+
// package / private
Index: DataR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/DataR.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** DataR.java 22 Jul 2002 21:51:59 -0000 1.5
--- DataR.java 24 Jul 2002 22:29:03 -0000 1.6
***************
*** 68,71 ****
* </code> if this root is N / A.
*/
! public abstract DataR getLocation();
}
--- 68,71 ----
* </code> if this root is N / A.
*/
! public abstract DataR getLocationR();
}
Index: ImageR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ImageR.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** ImageR.java 22 Jul 2002 21:51:59 -0000 1.12
--- ImageR.java 24 Jul 2002 22:29:03 -0000 1.13
***************
*** 408,412 ****
if (parentRoot != null)
parentMap.put(THREAD_KEY, parentRoot.getId());
! parentRoot=parent.getLocation();
if (parentRoot != null)
parentMap.put(LOCATION_KEY, parentRoot.getId());
--- 408,412 ----
if (parentRoot != null)
parentMap.put(THREAD_KEY, parentRoot.getId());
! parentRoot=parent.getLocationR();
if (parentRoot != null)
parentMap.put(LOCATION_KEY, parentRoot.getId());
***************
*** 1150,1154 ****
while (it.hasNext()) {
DataR el=(DataR) it.next();
! if (el.getLocation()==keyLocation)
return el;
}
--- 1150,1154 ----
while (it.hasNext()) {
DataR el=(DataR) it.next();
! if (el.getLocationR()==keyLocation)
return el;
}
***************
*** 1193,1197 ****
while (it.hasNext()) {
DataR data=(DataR) it.next();
! DataR location=data.getLocation();
System.out.println(location);
if (location instanceof AllocTraceR) {
--- 1193,1197 ----
while (it.hasNext()) {
DataR data=(DataR) it.next();
! DataR location=data.getLocationR();
System.out.println(location);
if (location instanceof AllocTraceR) {
Index: MethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MethodR.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** MethodR.java 22 Jul 2002 21:51:59 -0000 1.11
--- MethodR.java 24 Jul 2002 22:29:03 -0000 1.12
***************
*** 244,247 ****
--- 244,251 ----
return image;
}
+
+ public MethodRef getMethod() {
+ return this;
+ }
// statistics getter methods
***************
*** 297,300 ****
--- 301,311 ----
}
+ //-----------roots
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return this;
+ }
+
// roots
***************
*** 316,320 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return this;
}
--- 327,331 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
return this;
}
***************
*** 675,677 ****
--- 686,693 ----
}
}
+
+ /** Returns Location root of multi-rooted object. Returns <code>null
+ * </code> if this root is N / A.
+ */
+
}
Index: MonThreadMethodR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadMethodR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** MonThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.8
--- MonThreadMethodR.java 24 Jul 2002 22:29:03 -0000 1.9
***************
*** 117,122 ****
}
! // ---------- return parents
!
public ThreadRef getThread() {
needConstructed();
--- 117,123 ----
}
! // ---------- return parents, roots
! /** Returns ThreadRef root of this object.
! */
public ThreadRef getThread() {
needConstructed();
***************
*** 128,131 ****
--- 129,138 ----
return location;
}
+
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return getMethod();
+ }
// ---------- return roots of this object
***************
*** 149,153 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 156,160 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
***************
*** 277,281 ****
thread.refreshCPUThreadMethods();
List o=thread.getCPUThreadMethods();
! return (CPUThreadMethodRef) image.filterByLocation(o, getLocation());
}
--- 284,288 ----
thread.refreshCPUThreadMethods();
List o=thread.getCPUThreadMethods();
! return (CPUThreadMethodRef) image.filterByLocation(o, getLocationR());
}
***************
*** 286,290 ****
thread.refreshAllocThreadMethods();
List o=thread.getAllocThreadMethods();
! return (AllocThreadMethodRef) image.filterByLocation(o, getLocation());
}
--- 293,297 ----
thread.refreshAllocThreadMethods();
List o=thread.getAllocThreadMethods();
! return (AllocThreadMethodRef) image.filterByLocation(o, getLocationR());
}
Index: MonThreadTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadTraceR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** MonThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.7
--- MonThreadTraceR.java 24 Jul 2002 22:29:03 -0000 1.8
***************
*** 99,103 ****
// ---------- return child Lists
! // ---------- return parents
public MonThreadMethodRef getMonThreadMethod() {
--- 99,103 ----
// ---------- return child Lists
! // ---------- return parents, roots
public MonThreadMethodRef getMonThreadMethod() {
***************
*** 106,109 ****
--- 106,111 ----
}
+ /** Returns ThreadRef root of this object.
+ */
public ThreadRef getThread() {
needConstructed();
***************
*** 115,119 ****
return location;
}
!
// ---------- return roots of this object
--- 117,126 ----
return location;
}
!
! /** Returns LocationRef root of this object.
! */
! public LocationRef getLocation() {
! return getMonTrace();
! }
// ---------- return roots of this object
***************
*** 136,140 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
needConstructed();
return location;
--- 143,147 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
needConstructed();
return location;
Index: MonTraceR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonTraceR.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** MonTraceR.java 22 Jul 2002 21:51:59 -0000 1.9
--- MonTraceR.java 24 Jul 2002 22:29:03 -0000 1.10
***************
*** 141,145 ****
--- 141,153 ----
return time;
}
+
+ //------------roots
+ /** Returns LocationRef root of this object.
+ */
+ public LocationRef getLocation() {
+ return this;
+ }
+
// refresh
***************
*** 175,179 ****
}
! public DataR getLocation() {
return this;
}
--- 183,187 ----
}
! public DataR getLocationR() {
return this;
}
Index: ThreadGroupR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadGroupR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ThreadGroupR.java 22 Jul 2002 21:51:59 -0000 1.8
--- ThreadGroupR.java 24 Jul 2002 22:29:03 -0000 1.9
***************
*** 131,135 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return null;
}
--- 131,135 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
return null;
}
Index: ThreadR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadR.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ThreadR.java 22 Jul 2002 21:51:59 -0000 1.11
--- ThreadR.java 24 Jul 2002 22:29:03 -0000 1.12
***************
*** 331,335 ****
* </code> if this root is N / A.
*/
! public DataR getLocation() {
return null;
}
--- 331,335 ----
* </code> if this root is N / A.
*/
! public DataR getLocationR() {
return null;
}
Index: TypeR.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/TypeR.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TypeR.java 22 Jul 2002 21:51:59 -0000 1.1
--- TypeR.java 24 Jul 2002 22:29:03 -0000 1.2
***************
*** 215,218 ****
--- 215,226 ----
setData((IProf.sAllocStatData) data.statData);
}
+
+ //------------- roots
+
+ /** Returns TypeRef root of this object.
+ */
+ public TypeRef getType() {
+ return this;
+ }
// roots
***************
*** 226,230 ****
}
! public DataR getLocation() {
return null;
}
--- 234,238 ----
}
! public DataR getLocationR() {
return null;
}
|
Update of /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi
In directory usw-pr-cvs1:/tmp/cvs-serv17214
Modified Files:
AllocThreadMethodRef.java AllocThreadTraceRef.java
AllocTraceRef.java AllocTypeMethodRef.java
AllocTypeThreadMethodRef.java AllocTypeThreadRef.java
AllocTypeThreadTraceRef.java AllocTypeTraceRef.java
CPUThreadMethodRef.java CPUThreadTraceRef.java
CPUTraceRef.java MethodRef.java MonThreadMethodRef.java
MonThreadTraceRef.java MonTraceRef.java ThreadRef.java
TraceRef.java TypeRef.java
Log Message:
extends new interfaces for getting roots and info
Index: AllocThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocThreadMethodRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocThreadMethodRef.java 2 Jul 2002 20:18:29 -0000 1.4
--- AllocThreadMethodRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface AllocThreadMethodRef extends AllocStat {
CPUThreadMethodRef getSiblingCPU();
MonThreadMethodRef getSiblingMon();
--- 23,27 ----
import java.util.List;
! public interface AllocThreadMethodRef extends AllocStat, HasThread, HasLocation {
CPUThreadMethodRef getSiblingCPU();
MonThreadMethodRef getSiblingMon();
***************
*** 40,43 ****
--- 40,46 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:18:29 stolis
* License added.
Index: AllocThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocThreadTraceRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocThreadTraceRef.java 2 Jul 2002 20:18:29 -0000 1.4
--- AllocThreadTraceRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface AllocThreadTraceRef extends AllocStat {
CPUThreadTraceRef getSiblingCPU();
MonThreadTraceRef getSiblingMon();
--- 23,27 ----
import java.util.List;
! public interface AllocThreadTraceRef extends AllocStat, HasThread, HasLocation {
CPUThreadTraceRef getSiblingCPU();
MonThreadTraceRef getSiblingMon();
***************
*** 40,43 ****
--- 40,46 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:18:29 stolis
* License added.
Index: AllocTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTraceRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTraceRef.java 2 Jul 2002 20:18:29 -0000 1.4
--- AllocTraceRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface AllocTraceRef extends AllocStat, TraceRef {
CPUTraceRef getSiblingCPU();
MonTraceRef getSiblingMon();
--- 23,27 ----
import java.util.List;
! public interface AllocTraceRef extends AllocStat, TraceRef, HasLocation {
CPUTraceRef getSiblingCPU();
MonTraceRef getSiblingMon();
***************
*** 38,41 ****
--- 38,44 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:18:29 stolis
* License added.
Index: AllocTypeMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeMethodRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeMethodRef.java 2 Jul 2002 20:17:14 -0000 1.4
--- AllocTypeMethodRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface AllocTypeMethodRef extends AllocStat {
List getAllocTypeTraces();
--- 23,27 ----
import java.util.List;
! public interface AllocTypeMethodRef extends AllocStat, HasType, HasLocation {
List getAllocTypeTraces();
***************
*** 38,41 ****
--- 38,44 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:14 stolis
* License added.
Index: AllocTypeThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadMethodRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeThreadMethodRef.java 2 Jul 2002 20:17:14 -0000 1.4
--- AllocTypeThreadMethodRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface AllocTypeThreadMethodRef extends AllocStat {
List getAllocTypeThreadTraces();
--- 23,28 ----
import java.util.List;
! public interface AllocTypeThreadMethodRef extends AllocStat,
! HasType, HasThread, HasLocation {
List getAllocTypeThreadTraces();
***************
*** 37,40 ****
--- 38,44 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:14 stolis
* License added.
Index: AllocTypeThreadRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeThreadRef.java 2 Jul 2002 20:17:14 -0000 1.4
--- AllocTypeThreadRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface AllocTypeThreadRef extends AllocStat {
List getAllocTypeThreadMethods();
--- 23,27 ----
import java.util.List;
! public interface AllocTypeThreadRef extends AllocStat, HasType, HasThread {
List getAllocTypeThreadMethods();
***************
*** 39,42 ****
--- 39,45 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:14 stolis
* License added.
Index: AllocTypeThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeThreadTraceRef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AllocTypeThreadTraceRef.java 2 Jul 2002 20:17:14 -0000 1.3
--- AllocTypeThreadTraceRef.java 24 Jul 2002 22:28:10 -0000 1.4
***************
*** 23,27 ****
import java.util.List;
! public interface AllocTypeThreadTraceRef extends AllocStat {
AllocTypeThreadMethodRef getAllocTypeThreadMethod();
--- 23,28 ----
import java.util.List;
! public interface AllocTypeThreadTraceRef extends AllocStat,
! HasType, HasThread, HasLocation {
AllocTypeThreadMethodRef getAllocTypeThreadMethod();
***************
*** 33,36 ****
--- 34,40 ----
/*
* $Log$
+ * Revision 1.4 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.3 2002/07/02 20:17:14 stolis
* License added.
Index: AllocTypeTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/AllocTypeTraceRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** AllocTypeTraceRef.java 2 Jul 2002 20:17:14 -0000 1.4
--- AllocTypeTraceRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface AllocTypeTraceRef extends AllocStat {
List getAllocTypeThreadTraces();
--- 23,27 ----
import java.util.List;
! public interface AllocTypeTraceRef extends AllocStat, HasType, HasLocation {
List getAllocTypeThreadTraces();
***************
*** 38,41 ****
--- 38,44 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:14 stolis
* License added.
Index: CPUThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUThreadMethodRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CPUThreadMethodRef.java 2 Jul 2002 20:17:13 -0000 1.4
--- CPUThreadMethodRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface CPUThreadMethodRef extends CPUStat {
AllocThreadMethodRef getSiblingAlloc();
MonThreadMethodRef getSiblingMon();
--- 23,27 ----
import java.util.List;
! public interface CPUThreadMethodRef extends CPUStat, HasThread, HasLocation {
AllocThreadMethodRef getSiblingAlloc();
MonThreadMethodRef getSiblingMon();
***************
*** 38,41 ****
--- 38,44 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:13 stolis
* License added.
Index: CPUThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUThreadTraceRef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** CPUThreadTraceRef.java 2 Jul 2002 20:17:13 -0000 1.3
--- CPUThreadTraceRef.java 24 Jul 2002 22:28:10 -0000 1.4
***************
*** 23,27 ****
import java.util.List;
! public interface CPUThreadTraceRef extends CPUStat {
AllocThreadTraceRef getSiblingAlloc();
MonThreadTraceRef getSiblingMon();
--- 23,27 ----
import java.util.List;
! public interface CPUThreadTraceRef extends CPUStat, HasThread, HasLocation {
AllocThreadTraceRef getSiblingAlloc();
MonThreadTraceRef getSiblingMon();
***************
*** 34,37 ****
--- 34,40 ----
/*
* $Log$
+ * Revision 1.4 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.3 2002/07/02 20:17:13 stolis
* License added.
Index: CPUTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/CPUTraceRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CPUTraceRef.java 2 Jul 2002 20:17:13 -0000 1.4
--- CPUTraceRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface CPUTraceRef extends CPUStat, TraceRef {
AllocTraceRef getSiblingAlloc();
MonTraceRef getSiblingMon();
--- 23,27 ----
import java.util.List;
! public interface CPUTraceRef extends CPUStat, TraceRef, HasLocation {
AllocTraceRef getSiblingAlloc();
MonTraceRef getSiblingMon();
***************
*** 36,39 ****
--- 36,42 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:13 stolis
* License added.
Index: MethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MethodRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MethodRef.java 2 Jul 2002 20:17:13 -0000 1.4
--- MethodRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface MethodRef extends CPUStat, AllocStat, MonStat {
String getName();
String getSignature();
--- 23,27 ----
import java.util.List;
! public interface MethodRef extends CPUStat, AllocStat, MonStat, LocationRef, HasLocation {
String getName();
String getSignature();
***************
*** 50,53 ****
--- 50,56 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:13 stolis
* License added.
Index: MonThreadMethodRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonThreadMethodRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MonThreadMethodRef.java 2 Jul 2002 20:17:13 -0000 1.4
--- MonThreadMethodRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface MonThreadMethodRef extends MonStat {
CPUThreadMethodRef getSiblingCPU();
AllocThreadMethodRef getSiblingAlloc();
--- 23,27 ----
import java.util.List;
! public interface MonThreadMethodRef extends MonStat, HasThread, HasLocation {
CPUThreadMethodRef getSiblingCPU();
AllocThreadMethodRef getSiblingAlloc();
***************
*** 38,41 ****
--- 38,44 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:13 stolis
* License added.
Index: MonThreadTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonThreadTraceRef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MonThreadTraceRef.java 2 Jul 2002 20:17:13 -0000 1.3
--- MonThreadTraceRef.java 24 Jul 2002 22:28:10 -0000 1.4
***************
*** 23,27 ****
import java.util.List;
! public interface MonThreadTraceRef extends MonStat {
CPUThreadTraceRef getSiblingCPU();
AllocThreadTraceRef getSiblingAlloc();
--- 23,27 ----
import java.util.List;
! public interface MonThreadTraceRef extends MonStat, HasThread, HasLocation {
CPUThreadTraceRef getSiblingCPU();
AllocThreadTraceRef getSiblingAlloc();
***************
*** 34,37 ****
--- 34,40 ----
/*
* $Log$
+ * Revision 1.4 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.3 2002/07/02 20:17:13 stolis
* License added.
Index: MonTraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/MonTraceRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MonTraceRef.java 2 Jul 2002 20:17:13 -0000 1.4
--- MonTraceRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface MonTraceRef extends MonStat, TraceRef {
CPUTraceRef getSiblingCPU();
AllocTraceRef getSiblingAlloc();
--- 23,27 ----
import java.util.List;
! public interface MonTraceRef extends MonStat, TraceRef, HasLocation {
CPUTraceRef getSiblingCPU();
AllocTraceRef getSiblingAlloc();
***************
*** 36,39 ****
--- 36,42 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:13 stolis
* License added.
Index: ThreadRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/ThreadRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ThreadRef.java 2 Jul 2002 20:17:13 -0000 1.4
--- ThreadRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 24,28 ****
import java.util.Date;
! public interface ThreadRef extends CPUStat, AllocStat, MonStat {
String getName();
ThreadRef getParentThread();
--- 24,28 ----
import java.util.Date;
! public interface ThreadRef extends CPUStat, AllocStat, MonStat, HasThread {
String getName();
ThreadRef getParentThread();
***************
*** 56,59 ****
--- 56,62 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:13 stolis
* License added.
Index: TraceRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/TraceRef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** TraceRef.java 2 Jul 2002 20:17:13 -0000 1.3
--- TraceRef.java 24 Jul 2002 22:28:10 -0000 1.4
***************
*** 23,27 ****
import java.util.List;
! public interface TraceRef {
List getFrames();
--- 23,27 ----
import java.util.List;
! public interface TraceRef extends LocationRef, HasLocation {
List getFrames();
***************
*** 32,35 ****
--- 32,38 ----
/*
* $Log$
+ * Revision 1.4 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.3 2002/07/02 20:17:13 stolis
* License added.
Index: TypeRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/TypeRef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** TypeRef.java 2 Jul 2002 20:17:13 -0000 1.4
--- TypeRef.java 24 Jul 2002 22:28:10 -0000 1.5
***************
*** 23,27 ****
import java.util.List;
! public interface TypeRef extends AllocStat {
String getName();
ClassRef getComponentClass();
--- 23,27 ----
import java.util.List;
! public interface TypeRef extends AllocStat, HasType {
String getName();
ClassRef getComponentClass();
***************
*** 44,47 ****
--- 44,50 ----
/*
* $Log$
+ * Revision 1.5 2002/07/24 22:28:10 vachis
+ * extends new interfaces for getting roots and info
+ *
* Revision 1.4 2002/07/02 20:17:13 stolis
* License added.
|
|
From: Pavel V. <va...@us...> - 2002-07-24 22:27:19
|
Update of /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi In directory usw-pr-cvs1:/tmp/cvs-serv16868 Added Files: LocationRef.java HasType.java HasThread.java HasLocation.java Log Message: new interfaces for getting roots and info --- NEW FILE: LocationRef.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.jpi; /** * * @author Pavel Vacha */ public interface LocationRef { MethodRef getMethod(); } /* * $Log: LocationRef.java,v $ * Revision 1.1 2002/07/24 22:27:13 vachis * new interfaces for getting roots and info * */ --- NEW FILE: HasType.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.jpi; /** * * @author Pavel Vacha */ public interface HasType { public TypeRef getType(); } /* * $Log: HasType.java,v $ * Revision 1.1 2002/07/24 22:27:13 vachis * new interfaces for getting roots and info * */ --- NEW FILE: HasThread.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.jpi; /** * * @author Pavel Vacha */ public interface HasThread { public ThreadRef getThread(); } /* * $Log: HasThread.java,v $ * Revision 1.1 2002/07/24 22:27:13 vachis * new interfaces for getting roots and info * */ --- NEW FILE: HasLocation.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.jpi; /** * * @author Pavel Vacha */ public interface HasLocation { public LocationRef getLocation(); } /* * $Log: HasLocation.java,v $ * Revision 1.1 2002/07/24 22:27:13 vachis * new interfaces for getting roots and info * */ |
|
From: Marek P. <ma...@us...> - 2002-07-23 22:09:31
|
Update of /cvsroot/javaprofiler/library/config In directory usw-pr-cvs1:/tmp/cvs-serv23138/config Modified Files: config_sparc_sunos58_gcc302.mk config_x86_linux_gcc302.mk config_x86_win32_vc98.mk Log Message: small changes Index: config_sparc_sunos58_gcc302.mk =================================================================== RCS file: /cvsroot/javaprofiler/library/config/config_sparc_sunos58_gcc302.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** config_sparc_sunos58_gcc302.mk 15 Apr 2002 21:04:14 -0000 1.5 --- config_sparc_sunos58_gcc302.mk 23 Jul 2002 22:09:27 -0000 1.6 *************** *** 16,20 **** COMPILER_PATH = /opt/gcc-3.0.2 ! JAVA_PATH = /opt/j2sdk1.4.0 DOXYGEN_PATH = /opt/doxygen-1.2.12 --- 16,20 ---- COMPILER_PATH = /opt/gcc-3.0.2 ! JAVA_PATH = /opt/j2sdk1.4.1 DOXYGEN_PATH = /opt/doxygen-1.2.12 Index: config_x86_linux_gcc302.mk =================================================================== RCS file: /cvsroot/javaprofiler/library/config/config_x86_linux_gcc302.mk,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** config_x86_linux_gcc302.mk 15 Apr 2002 21:04:14 -0000 1.8 --- config_x86_linux_gcc302.mk 23 Jul 2002 22:09:27 -0000 1.9 *************** *** 16,20 **** COMPILER_PATH = /opt/gcc-3.0.2 ! JAVA_PATH = /opt/j2sdk1.4.0 DOXYGEN_PATH = /opt/doxygen-1.2.12 --- 16,20 ---- COMPILER_PATH = /opt/gcc-3.0.2 ! JAVA_PATH = /opt/j2sdk1.4.1 DOXYGEN_PATH = /opt/doxygen-1.2.12 Index: config_x86_win32_vc98.mk =================================================================== RCS file: /cvsroot/javaprofiler/library/config/config_x86_win32_vc98.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** config_x86_win32_vc98.mk 15 Apr 2002 21:04:14 -0000 1.3 --- config_x86_win32_vc98.mk 23 Jul 2002 22:09:27 -0000 1.4 *************** *** 16,20 **** COMPILER_PATH = C:\Program Files\Microsoft Visual Studio\VC98 ! JAVA_PATH = C:\Program Files\j2sdk1.4.0 DOXYGEN_PATH = C:\Program Files\doxygen-1.2.12 --- 16,20 ---- COMPILER_PATH = C:\Program Files\Microsoft Visual Studio\VC98 ! JAVA_PATH = C:\Program Files\j2sdk1.4.1 DOXYGEN_PATH = C:\Program Files\doxygen-1.2.12 |
|
From: Marek P. <ma...@us...> - 2002-07-23 22:09:31
|
Update of /cvsroot/javaprofiler/library
In directory usw-pr-cvs1:/tmp/cvs-serv23138
Modified Files:
README config.mk
Log Message:
small changes
Index: README
===================================================================
RCS file: /cvsroot/javaprofiler/library/README,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** README 17 Jul 2002 18:40:36 -0000 1.42
--- README 23 Jul 2002 22:09:27 -0000 1.43
***************
*** 90,94 ****
written in Java. Because of stability and standard Sun's JVM is used.
! * JDK 1.4.0
Nowadays, client's code is in separate CVS module called "jpiimpl".
--- 90,94 ----
written in Java. Because of stability and standard Sun's JVM is used.
! * JDK 1.4.1 beta
Nowadays, client's code is in separate CVS module called "jpiimpl".
***************
*** 190,194 ****
* GNU C/C++ 3.0.2 (gcc.gnu.org) [for free]
! * JDK 1.4.0 (java.sun.com) [for free]
* Doxygen 1.2.12 (www.doxygen.org) [for free]
--- 190,194 ----
* GNU C/C++ 3.0.2 (gcc.gnu.org) [for free]
! * JDK 1.4.1 beta (java.sun.com) [for free]
* Doxygen 1.2.12 (www.doxygen.org) [for free]
***************
*** 344,348 ****
! $ export CLASSPATH=<full_path_to_iprof_jar/IProf.jar;.
--- 344,348 ----
! $ export CLASSPATH=<full_path_to_iprof_jar>/IProf.jar;.
Index: config.mk
===================================================================
RCS file: /cvsroot/javaprofiler/library/config.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** config.mk 22 Apr 2002 12:04:05 -0000 1.39
--- config.mk 23 Jul 2002 22:09:27 -0000 1.40
***************
*** 16,20 ****
COMPILER_PATH = /home2/mm/gcc-3.0.2
! JAVA_PATH = /home2/mm/j2sdk1.4.0
DOXYGEN_PATH = /home2/mm
--- 16,20 ----
COMPILER_PATH = /home2/mm/gcc-3.0.2
! JAVA_PATH = /home2/mm/j2sdk1.4.1
DOXYGEN_PATH = /home2/mm
|
|
From: Pavel V. <va...@us...> - 2002-07-22 23:39:51
|
Update of /cvsroot/javaprofiler/test/module
In directory usw-pr-cvs1:/tmp/cvs-serv16670
Modified Files:
TestAllocHistView.java
Log Message:
realtime is working
Index: TestAllocHistView.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/module/TestAllocHistView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TestAllocHistView.java 22 Jul 2002 17:52:48 -0000 1.2
--- TestAllocHistView.java 22 Jul 2002 23:39:48 -0000 1.3
***************
*** 25,29 ****
--- 25,31 ----
import javax.swing.JFrame;
import javax.swing.JScrollPane;
+
import java.awt.*;
+ import java.awt.event.*;
import net.sourceforge.javaprofiler.module.views.*;
***************
*** 36,39 ****
--- 38,42 ----
*/
public class TestAllocHistView {
+ VirtualMachineRef vm;
VirtualMachineImageRef image;
JFrame frame;
***************
*** 44,51 ****
public TestAllocHistView() {
try {
! VirtualMachineRef vm = connect();
!
! image = vm.getRealtimeImage();
((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
refreshTypes();
--- 47,53 ----
public TestAllocHistView() {
try {
! vm = connect();
+ image = vm.realtimeImage();
((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
refreshTypes();
***************
*** 55,59 ****
frame=new JFrame("Main");
! frame.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE);
JTable table = new AllocHistogramTable(
--- 57,67 ----
frame=new JFrame("Main");
! frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
! frame.addWindowListener(new WindowAdapter() {
! public void windowClosing(WindowEvent e) {
! vm.dispose(); //necessary cleanup especialy for shmem conectors
! System.exit(0);
! }
! });
JTable table = new AllocHistogramTable(
***************
*** 75,89 ****
private class RefreshThread extends Thread {
! java.util.List types;
public RefreshThread() {
types = image.getTypes();
}
! public void run () {
! ((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
! refreshTypes();
! try {
! sleep(1000);
! }
! catch ( InterruptedException e ) {
}
}
--- 83,103 ----
private class RefreshThread extends Thread {
! public boolean stop;
!
! private java.util.List types;
!
public RefreshThread() {
types = image.getTypes();
+ stop = false;
}
! public void run() {
! while( !stop ) {
! ((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
! refreshTypes();
! try {
! sleep(500);
! }
! catch ( InterruptedException e ) {
! }
}
}
|
|
From: Pavel V. <va...@us...> - 2002-07-22 23:39:24
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views
In directory usw-pr-cvs1:/tmp/cvs-serv16586
Modified Files:
AllocHistogramTableModel.java AllocHistogramTable.java
Log Message:
realtime is working
Index: AllocHistogramTableModel.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/AllocHistogramTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AllocHistogramTableModel.java 22 Jul 2002 00:20:24 -0000 1.1
--- AllocHistogramTableModel.java 22 Jul 2002 23:39:21 -0000 1.2
***************
*** 36,41 ****
private String columnNames[] = { "name", "count", "max count", "histogram", "space", "max space" };
private Class columnClasses[] = { String.class, Long.class, Long.class, AllocStat.class, Long.class, Long.class };
! private Method method_getName;
/** Creates a new instance of HistogramTableModel
--- 36,42 ----
private String columnNames[] = { "name", "count", "max count", "histogram", "space", "max space" };
private Class columnClasses[] = { String.class, Long.class, Long.class, AllocStat.class, Long.class, Long.class };
+ private AllocStatListener statListener;
! //private Method method_getName;
/** Creates a new instance of HistogramTableModel
***************
*** 45,53 ****
public AllocHistogramTableModel(List allocStats) {
this.allocStats = allocStats;
ListIterator iter = allocStats.listIterator();
while ( iter.hasNext() ) {
! AllocStat alloc = (AllocStat) iter.next();
! alloc.addAllocStatListener( new HistogramStatListener() );
}
--- 46,54 ----
public AllocHistogramTableModel(List allocStats) {
this.allocStats = allocStats;
+ statListener = new HistogramStatListener();
ListIterator iter = allocStats.listIterator();
while ( iter.hasNext() ) {
! ((AllocStat) iter.next()).addAllocStatListener( statListener );
}
***************
*** 58,62 ****
//parent.addChildListener( type, new HistogramChildrenListener );
! if ( ! (allocStats.get(0) instanceof TypeRef) ) {
try {
Method method_getName = allocStats.get(0).getClass()
--- 59,63 ----
//parent.addChildListener( type, new HistogramChildrenListener );
! /*if ( ! (allocStats.get(0) instanceof TypeRef) ) {
try {
Method method_getName = allocStats.get(0).getClass()
***************
*** 66,70 ****
throw new RuntimeException( e.getMessage() + " requested method: getType()" );
}
! }
}
--- 67,71 ----
throw new RuntimeException( e.getMessage() + " requested method: getType()" );
}
! }*/
}
***************
*** 83,86 ****
--- 84,88 ----
switch ( colIndex ) {
case 0: {
+ //return ((HaveTypeRoot) alloc).getType().getName();
//FIXME
if ( alloc instanceof TypeRef ) {
***************
*** 88,92 ****
}
//FIXME add interface with getType method
! try {
return ((TypeRef) method_getName.invoke( alloc, null )).getName();
}
--- 90,94 ----
}
//FIXME add interface with getType method
! /*try {
return ((TypeRef) method_getName.invoke( alloc, null )).getName();
}
***************
*** 99,103 ****
catch (InvocationTargetException e) {
throw new RuntimeException( e.getMessage() + " requested method: getType()" );
! }
}
case 1: {
--- 101,105 ----
catch (InvocationTargetException e) {
throw new RuntimeException( e.getMessage() + " requested method: getType()" );
! }*/
}
case 1: {
***************
*** 139,145 ****
class HistogramStatListener implements AllocStatListener {
public void allocStatChanged( AllocStatEvent event ) {
! //FIXME how to get index
int index = allocStats.indexOf( event.getSource() );
! fireTableRowsUpdated(index, index);
}
}
--- 141,152 ----
class HistogramStatListener implements AllocStatListener {
public void allocStatChanged( AllocStatEvent event ) {
! //FIXME dispatch to swing thread
int index = allocStats.indexOf( event.getSource() );
! //??do invokeLater
! //!!why this don't work
! //fireTableRowsUpdated(index, index);
!
! //use brutal method
! fireTableDataChanged();
}
}
***************
*** 148,164 ****
public void childrenAdded( ChildrenEvent event ) {
int delta[] = event.getDeltaIndices();
! int i=0,j=0;
int len = delta.length;
while (i<len) {
j=i+1;
! while (delta[i] - delta[j] == i-j) { //pack neighbours into one event
! j++;
! if (j >= len )
! break;
}
fireTableRowsInserted( i, j-1 );
i = j;
}
};
--- 155,178 ----
public void childrenAdded( ChildrenEvent event ) {
int delta[] = event.getDeltaIndices();
! int i=0,j=0, old = 0;
int len = delta.length;
while (i<len) {
j=i+1;
! if (j<len) {
! while (delta[i] - delta[j] == i-j) { //pack neighbours into one event
! j++;
! if (j >= len )
! break;
! }
}
fireTableRowsInserted( i, j-1 );
i = j;
}
+
+ //register allocStat listener for new instances
+ for (i=0; i<len; i++) {
+ ((AllocStat) allocStats.get(i)).addAllocStatListener(statListener);
+ }
};
***************
*** 170,177 ****
while (i<len) {
j=i+1;
! while (delta[i] - delta[j] == i-j) { //pack neighbours into one event
! j++;
! if (j >= len )
! break;
}
fireTableRowsUpdated( i, j-1 );
--- 184,193 ----
while (i<len) {
j=i+1;
! if (j<len) {
! while (delta[i] - delta[j] == i-j) { //pack neighbours into one event
! j++;
! if (j >= len )
! break;
! }
}
fireTableRowsUpdated( i, j-1 );
Index: AllocHistogramTable.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/views/AllocHistogramTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AllocHistogramTable.java 22 Jul 2002 00:20:24 -0000 1.1
--- AllocHistogramTable.java 22 Jul 2002 23:39:21 -0000 1.2
***************
*** 64,67 ****
--- 64,69 ----
setOpaque( true );
setBorder(noFocusBorder);
+
+ //setHorizontalAlignment( RIGHT );
}
***************
*** 129,136 ****
while( barMax < alloc.getLiveInstancesCount() ) {
barMax = barMax * 2;
! //PENDING REDRAW
}
! bar.setValue( (int) (100*alloc.getLiveInstancesCount()/barMax) );
if (isBordered) {
--- 131,141 ----
while( barMax < alloc.getLiveInstancesCount() ) {
barMax = barMax * 2;
!
! //PENDING fire event
! //?invoke later
! //fireTableDataChanged();
}
! bar.setValue( (int) ((100*alloc.getLiveInstancesCount())/barMax) );
if (isBordered) {
|
|
From: Pavel V. <va...@us...> - 2002-07-22 23:38:20
|
Update of /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi
In directory usw-pr-cvs1:/tmp/cvs-serv16303
Modified Files:
VirtualMachineRef.java
Log Message:
no message
Index: VirtualMachineRef.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpi/net/sourceforge/javaprofiler/jpi/VirtualMachineRef.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** VirtualMachineRef.java 22 Jul 2002 17:49:59 -0000 1.5
--- VirtualMachineRef.java 22 Jul 2002 23:38:17 -0000 1.6
***************
*** 38,42 ****
* without creating snapshot. For one instace of VirtalMachineImpl it returns always the same refenrece.
*/
! VirtualMachineImageRef getRealtimeImage();
/**
--- 38,42 ----
* without creating snapshot. For one instace of VirtalMachineImpl it returns always the same refenrece.
*/
! VirtualMachineImageRef realtimeImage();
/**
***************
*** 124,127 ****
--- 124,130 ----
/*
* $Log$
+ * Revision 1.6 2002/07/22 23:38:17 vachis
+ * no message
+ *
* Revision 1.5 2002/07/22 17:49:59 vachis
* realtime via getRealtimeImage() method, it no longer extends VirtualMachineImageRef
|
|
From: Pavel V. <va...@us...> - 2002-07-22 23:37:56
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl
In directory usw-pr-cvs1:/tmp/cvs-serv16112
Modified Files:
VirtualMachineImpl.java
Log Message:
no message
Index: VirtualMachineImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/VirtualMachineImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** VirtualMachineImpl.java 22 Jul 2002 17:51:30 -0000 1.10
--- VirtualMachineImpl.java 22 Jul 2002 23:37:51 -0000 1.11
***************
*** 261,265 ****
* without creating snapshot. For one instace of VirtalMachineImpl it returns always the same refenrece.
*/
! public VirtualMachineImageRef getRealtimeImage() {
return realtime;
}
--- 261,265 ----
* without creating snapshot. For one instace of VirtalMachineImpl it returns always the same refenrece.
*/
! public VirtualMachineImageRef realtimeImage() {
return realtime;
}
***************
*** 269,272 ****
--- 269,275 ----
/*
* $Log$
+ * Revision 1.11 2002/07/22 23:37:51 vachis
+ * no message
+ *
* Revision 1.10 2002/07/22 17:51:30 vachis
* realtime via getRealtimeImage() method, it no longer implements VirtualMachineImageRef
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime In directory usw-pr-cvs1:/tmp/cvs-serv19073 Modified Files: AllocThreadMethodR.java AllocThreadTraceR.java AllocTraceR.java AllocTypeMethodR.java AllocTypeThreadMethodR.java AllocTypeThreadR.java AllocTypeThreadTraceR.java AllocTypeTraceR.java ClassR.java CPUThreadMethodR.java CPUThreadTraceR.java CPUTraceR.java DataR.java ImageR.java MethodR.java MonThreadMethodR.java MonThreadTraceR.java MonTraceR.java ThreadGroupR.java ThreadR.java Added Files: TypeR.java Log Message: rename AllocTypeR -> TypeR --- NEW FILE: TypeR.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.jpiimpl.realtime; import java.util.*; import javax.swing.event.EventListenerList; import net.sourceforge.javaprofiler.jpi.*; import net.sourceforge.javaprofiler.jpiimpl.commun.IProf; import net.sourceforge.javaprofiler.jpiimpl.commun.IProfException; /** Implementation of API AllocType * @author Lukas Petru */ public class TypeR extends DataR implements TypeRef { /** Tells if any data was loaded from profiled VM about this Type. */ private boolean isReady; /** VM Image that constructed this object. */ private ImageR image; /** Object identification. */ private Integer objId; // private data accessible via getter methods private String name; private boolean isArray; private boolean isPrimitiveArray; private ClassR componentClass; // memory info private long numLiveInstances; private long numTotalInstances; private long sizeLiveInstances; private long sizeTotalInstances; // lists for children private final List allocTypeMethods=new ArrayList(0); private final List allocTypeTraces=new ArrayList(0); private final List allocTypeThreads=new ArrayList(0); // unmodifiable variants of lists for children private final List roAllocTypeMethods=Collections.unmodifiableList( allocTypeMethods); private final List roAllocTypeTraces=Collections.unmodifiableList( allocTypeTraces); private final List roAllocTypeThreads=Collections.unmodifiableList( allocTypeThreads); /** A list of event listeners for this component. */ protected EventListenerList listenerList = new EventListenerList(); protected transient AllocStatEvent allocEvent; private Map listenersMap=new HashMap(1); /** This constructor will find it's component class on its own through * RtImage. * @param sid Object with data from communication layer. * @param RtImage <code>VirtualMachineImage</code> object to which this * object shall belong */ TypeR(IProf.sID sid, ImageR RtImage) { image = RtImage; objId = new Integer(sid.objId); construct((IProf.sObjectInfo) sid.info); } /** Creates object with only Id and no data. * @param oId Identification of object as assigned by communication layer. * @param RtImage <code>VirtualMachineImage</code> object to which this * object shall belong */ TypeR(Integer oId, ImageR RtImage) { objId = oId; image = RtImage; } // info getter methods /** Returns name of a type. */ public String getName() { needConstructed(); return name; } /** Returns component class of this type. */ public ClassRef getComponentClass() { needConstructed(); return componentClass; } /** Returns true, if this type is an array. */ public boolean isArray() { needConstructed(); return isArray; } /** Returns true, if this type is an array of primitive component type. */ public boolean isArrayOfPrimitives() { needConstructed(); return isPrimitiveArray; } // children lists getter methods public void refreshAllocTypeTraces() { if (! image.getAlwaysRefresh()) refreshAllocTypeMethods(); Iterator it=getAllocTypeMethods().iterator(); while (it.hasNext()) { AllocTypeMethodR o=(AllocTypeMethodR) it.next(); o.refreshAllocTypeTraces(); } } public List getAllocTypeTraces() { if ( image.getAlwaysRefresh() ) refreshAllocTypeTraces(); return roAllocTypeTraces; } public void refreshAllocTypeMethods() { image.extractMultiRoot(this, IProf.ALLOC_OBJECT_METHODS, image.allocTypeMethodFactory); } public List getAllocTypeMethods() { if ( image.getAlwaysRefresh() ) refreshAllocTypeMethods(); return roAllocTypeMethods; } public void refreshAllocTypeThreads() { image.extractMultiRoot(this, IProf.ALLOC_OBJECT_THREADS, image.allocTypeThreadFactory); } public List getAllocTypeThreads() { if ( image.getAlwaysRefresh() ) refreshAllocTypeThreads(); return roAllocTypeThreads; } // image getter method public VirtualMachineImageRef getVirtualMachineImage () { return image; } // statistics getter methods public long getLiveInstancesCount() { conditionalRefresh(); return numLiveInstances; } public long getTotalInstancesCount() { conditionalRefresh(); return numTotalInstances; } public long getLiveInstancesSize() { conditionalRefresh(); return sizeLiveInstances; } public long getTotalInstancesSize() { conditionalRefresh(); return sizeTotalInstances; } // refresh /** Refreshes statistics. */ public void refresh() { // method should synchronize on image to be thread-safe IProf.sData data; try { data = image.getIProf().getData(objId.intValue(), IProf.ALLOC_DATA); } catch (IProfException e) { // PENDING throw new RuntimeException(e.getMessage()); } setData((IProf.sAllocStatData) data.statData); } // roots public TypeR getTypeR() { return this; } public ThreadR getThreadR() { return null; } public DataR getLocation() { return null; } // private / package void addAllocTypeMethod(AllocTypeMethodRef o) { allocTypeMethods.add(o); image.fireChildrenAdded(new ChildrenEvent(this, Constants. ALLOC_TYPE_METHOD, new Object[]{o}, new int[]{ allocTypeMethods.size()-1}), listenersMap); } void addAllocTypeTrace(AllocTypeTraceRef o) { allocTypeTraces.add(o); image.fireChildrenAdded(new ChildrenEvent(this, Constants. ALLOC_TYPE_TRACE, new Object[]{o}, new int[]{ allocTypeTraces.size()-1}), listenersMap); } void addAllocTypeThread(AllocTypeThreadRef o) { allocTypeThreads.add(o); image.fireChildrenAdded(new ChildrenEvent(this, Constants. ALLOC_TYPE_THREAD, new Object[]{o}, new int[]{ allocTypeThreads.size()-1}), listenersMap); } /** Finishes object construction with info gained from profiled VM. * @param sid Object info. */ void construct(IProf.sID sid) { // method should be synchronized to be thread-safe (because of // isReady) if (!isReady) construct((IProf.sObjectInfo) sid.info); } /** Finishes object construction. * @param info <code>sObjectInfo</code> object with data from communication layer. * @param component <code>Class</code> object to which this objects links. */ private void construct (IProf.sObjectInfo info, ClassR component) { isArray = true; isPrimitiveArray = component == null; componentClass = component; switch (info.isArray) { case IProf.JVMPI_NORMAL_OBJECT: name = component.getName(); isArray = false; break; case IProf.JVMPI_CLASS: name = component.getName() + "[]"; break; case IProf.JVMPI_BOOLEAN: name = "boolean[]"; //[Z break; case IProf.JVMPI_BYTE: name = "byte[]"; //[B break; case IProf.JVMPI_CHAR: name = "char[]"; //[C break; case IProf.JVMPI_SHORT: name = "short[]"; //[S break; case IProf.JVMPI_INT: name = "int[]"; //[I break; case IProf.JVMPI_LONG: name = "long[]";//[J break; case IProf.JVMPI_FLOAT: name = "float[]"; //[F break; case IProf.JVMPI_DOUBLE: name = "double[]"; //[D break; default: name = ""; } isReady = true; } /** Finishes Type object construction. This method will find component * class of object on its own through image. * @param info <code>sObjectInfo</code> object with data from * communication layer. */ private void construct(IProf.sObjectInfo info) { // resolve component class ClassR component; Integer clId = new Integer(info.classObjId); if (clId.intValue() != 0) component = image.resolveClass(clId); else component = null; construct(info, component); } /** Tests if object needs to load its info and does, if so. */ private void needConstructed() { // method should be synchronized to be thread-safe (because of // isReady) if (!isReady) { IProf.sObjectInfo info; try { info = (IProf.sObjectInfo) image.getIProf(). getInfo(objId.intValue(), IProf.OBJECT_INFO); } catch (IProfException e) { // PENDING throw new RuntimeException(e.getMessage()); } construct(info); } } /** Determines whether refresh should be done and does, if so. */ private void conditionalRefresh() { if (image.getAlwaysRefresh()) refresh(); } /** Fills object with data gained from profiled VM. * @param data Data. */ void setData(IProf.sAllocStatData allocData) { if (numLiveInstances!=allocData.allocNumInstancesLive || numTotalInstances!=allocData.allocNumInstancesTotal || sizeLiveInstances!=allocData.allocSizeInstancesLive || sizeTotalInstances!=allocData.allocSizeInstancesTotal) { numLiveInstances=allocData.allocNumInstancesLive; numTotalInstances=allocData.allocNumInstancesTotal; sizeLiveInstances=allocData.allocSizeInstancesLive; sizeTotalInstances=allocData.allocSizeInstancesTotal; fireAllocStatChanged(); } } /** Fills object with data gained from profiled VM. * @param sid Object info and data. */ void setData(IProf.sID sid) { setData(sid.alloc); } /** Returns number that identifies object for profiler library. */ 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); } public String toString () { return getName(); } // ---------- listeners /** * Removes an <code>ChildrenListener</code> from this object. * @param type Type of children to listen events for. Constants are defined * in net.sourceforge.javaprofiler.jpi.Constants. * @param l the listener to be removed */ public void removeChildrenListener(int type, ChildrenListener l) { image.removeChildrenListenerChecked(type, l, listenersMap, new int[] {Constants.ALLOC_TYPE_METHOD, Constants.ALLOC_TYPE_TRACE, Constants.ALLOC_TYPE_THREAD}); } /** * Adds an <code>ChildrenListener</code> to this object. * <strong>Warning:</strong> Events are not dispatched in the swing event- * dispatching thread, rather they are dispatched in the thread which * caused new data to be loaded. * @param type Type of children to listen events for. Constants are defined * in net.sourceforge.javaprofiler.jpi.Constants. * @param l the listener to be added */ public void addChildrenListener(int type, ChildrenListener l) { image.addChildrenListenerChecked(type, l, listenersMap, new int[] {Constants.ALLOC_TYPE_METHOD, Constants.ALLOC_TYPE_TRACE, Constants.ALLOC_TYPE_THREAD}); } /** * Removes an <code>AllocStatListener</code> from this object. * @param l the listener to be removed */ public void removeAllocStatListener(AllocStatListener l) { listenerList.remove(AllocStatListener.class, l); } /** * Adds an <code>AllocStatListener</code> to this object. * @param l the listener to be added */ public void addAllocStatListener(AllocStatListener l) { listenerList.add(AllocStatListener.class, l); } /** * Notifies all listeners that have registered interest for * notification on this event type. The event instance * is lazily created. */ protected void fireAllocStatChanged() { // Guaranteed to return a non-null array Object[] listeners = listenerList.getListenerList(); // Process the listeners last to first, notifying // those that are interested in this event for (int i = listeners.length-2; i>=0; i-=2) { if (listeners[i]==AllocStatListener.class) { // Lazily create the event: if (allocEvent == null) allocEvent = new AllocStatEvent(this); ((AllocStatListener)listeners[i+1]).allocStatChanged( allocEvent); } } } } Index: AllocThreadMethodR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadMethodR.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** AllocThreadMethodR.java 18 Jul 2002 08:48:20 -0000 1.10 --- AllocThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.11 *************** *** 82,86 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 82,86 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 150,154 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 150,154 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: AllocThreadTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocThreadTraceR.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** AllocThreadTraceR.java 18 Jul 2002 08:48:20 -0000 1.8 --- AllocThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.9 *************** *** 80,84 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 80,84 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 142,146 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 142,146 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: AllocTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTraceR.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** AllocTraceR.java 18 Jul 2002 08:48:20 -0000 1.9 --- AllocTraceR.java 22 Jul 2002 21:51:59 -0000 1.10 *************** *** 206,210 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 206,210 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: AllocTypeMethodR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeMethodR.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** AllocTypeMethodR.java 18 Jul 2002 08:48:20 -0000 1.9 --- AllocTypeMethodR.java 22 Jul 2002 21:51:59 -0000 1.10 *************** *** 55,59 **** // roots to which this object is linked ! private AllocTypeR type; private MethodR location; --- 55,59 ---- // roots to which this object is linked ! private TypeR type; private MethodR location; *************** *** 80,84 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 80,84 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 124,128 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { needConstructed(); return type; --- 124,128 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { needConstructed(); return type; Index: AllocTypeThreadMethodR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadMethodR.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** AllocTypeThreadMethodR.java 18 Jul 2002 08:48:20 -0000 1.9 --- AllocTypeThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.10 *************** *** 55,59 **** // roots to which this object is linked ! private AllocTypeR type; private ThreadR thread; private MethodR location; --- 55,59 ---- // roots to which this object is linked ! private TypeR type; private ThreadR thread; private MethodR location; *************** *** 83,87 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 83,87 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 145,149 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { needConstructed(); return type; --- 145,149 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { needConstructed(); return type; Index: AllocTypeThreadR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadR.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** AllocTypeThreadR.java 18 Jul 2002 08:48:20 -0000 1.10 --- AllocTypeThreadR.java 22 Jul 2002 21:51:59 -0000 1.11 *************** *** 55,59 **** // roots to which this object is linked ! private AllocTypeR type; private ThreadR thread; --- 55,59 ---- // roots to which this object is linked ! private TypeR type; private ThreadR thread; *************** *** 80,84 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 80,84 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 124,128 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { needConstructed(); return type; --- 124,128 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { needConstructed(); return type; Index: AllocTypeThreadTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeThreadTraceR.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** AllocTypeThreadTraceR.java 11 Jul 2002 18:17:23 -0000 1.7 --- AllocTypeThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.8 *************** *** 55,59 **** // roots to which this object is linked ! private AllocTypeR type; private ThreadR thread; private AllocTraceR location; --- 55,59 ---- // roots to which this object is linked ! private TypeR type; private ThreadR thread; private AllocTraceR location; *************** *** 76,80 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 76,80 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 132,136 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { needConstructed(); return type; --- 132,136 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { needConstructed(); return type; Index: AllocTypeTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/AllocTypeTraceR.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** AllocTypeTraceR.java 18 Jul 2002 08:48:20 -0000 1.9 --- AllocTypeTraceR.java 22 Jul 2002 21:51:59 -0000 1.10 *************** *** 54,58 **** // roots to which this object is linked ! private AllocTypeR type; private AllocTraceR location; --- 54,58 ---- // roots to which this object is linked ! private TypeR type; private AllocTraceR location; *************** *** 79,83 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 79,83 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 141,145 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { needConstructed(); return type; --- 141,145 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { needConstructed(); return type; Index: ClassR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ClassR.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** ClassR.java 17 Jul 2002 12:25:36 -0000 1.6 --- ClassR.java 22 Jul 2002 21:51:59 -0000 1.7 *************** *** 166,170 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 166,170 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: CPUThreadMethodR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadMethodR.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** CPUThreadMethodR.java 18 Jul 2002 08:48:21 -0000 1.7 --- CPUThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.8 *************** *** 77,81 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 77,81 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 134,138 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 134,138 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: CPUThreadTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUThreadTraceR.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** CPUThreadTraceR.java 11 Jul 2002 18:17:23 -0000 1.6 --- CPUThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.7 *************** *** 70,74 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 70,74 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 121,125 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 121,125 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: CPUTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/CPUTraceR.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** CPUTraceR.java 18 Jul 2002 08:48:21 -0000 1.8 --- CPUTraceR.java 22 Jul 2002 21:51:59 -0000 1.9 *************** *** 163,167 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 163,167 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: DataR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/DataR.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** DataR.java 12 Jun 2002 23:02:17 -0000 1.4 --- DataR.java 22 Jul 2002 21:51:59 -0000 1.5 *************** *** 58,62 **** * </code> if this root is N / A. */ ! public abstract AllocTypeR getTypeR(); /** Returns ThreadRef root of multi-rooted object. Returns <code>null --- 58,62 ---- * </code> if this root is N / A. */ ! public abstract TypeR getTypeR(); /** Returns ThreadRef root of multi-rooted object. Returns <code>null Index: ImageR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ImageR.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** ImageR.java 17 Jul 2002 22:11:14 -0000 1.11 --- ImageR.java 22 Jul 2002 21:51:59 -0000 1.12 *************** *** 151,155 **** .getDeclaredConstructor(parameterTypes); typeFactory=java.lang.Class.forName( ! "net.sourceforge.javaprofiler.jpiimpl.realtime.AllocTypeR") .getDeclaredConstructor(parameterTypes); classFactory=java.lang.Class.forName( --- 151,155 ---- .getDeclaredConstructor(parameterTypes); typeFactory=java.lang.Class.forName( ! "net.sourceforge.javaprofiler.jpiimpl.realtime.TypeR") .getDeclaredConstructor(parameterTypes); classFactory=java.lang.Class.forName( *************** *** 180,184 **** .getDeclaredConstructor(parameterTypes); typeIDFactory=java.lang.Class.forName( ! "net.sourceforge.javaprofiler.jpiimpl.realtime.AllocTypeR") .getDeclaredConstructor(parameterTypes); classIDFactory=java.lang.Class.forName( --- 180,184 ---- .getDeclaredConstructor(parameterTypes); typeIDFactory=java.lang.Class.forName( ! "net.sourceforge.javaprofiler.jpiimpl.realtime.TypeR") .getDeclaredConstructor(parameterTypes); classIDFactory=java.lang.Class.forName( *************** *** 768,775 **** * has objId. */ ! AllocTypeR resolveAllocType(Integer oId) { List children=types; int old=children.size(); ! AllocTypeR res=(AllocTypeR) resolveRoot(oId, null, typeIDFactory, children); int nw=children.size(); --- 768,775 ---- * has objId. */ ! TypeR resolveAllocType(Integer oId) { List children=types; int old=children.size(); ! TypeR res=(TypeR) resolveRoot(oId, null, typeIDFactory, children); int nw=children.size(); *************** *** 786,794 **** * <code>sid</code> passed in a parameter. */ ! AllocTypeR resolveAllocType(IProf.sID sid) { Integer oId = new Integer(sid.objId); List children=types; int old=children.size(); ! AllocTypeR res=(AllocTypeR) resolveRoot(oId, sid, typeFactory, types); int nw=children.size(); if (old!=nw && typeListeners.getListenerCount()!=0) { --- 786,794 ---- * <code>sid</code> passed in a parameter. */ ! TypeR resolveAllocType(IProf.sID sid) { Integer oId = new Integer(sid.objId); List children=types; int old=children.size(); ! TypeR res=(TypeR) resolveRoot(oId, sid, typeFactory, types); int nw=children.size(); if (old!=nw && typeListeners.getListenerCount()!=0) { Index: MethodR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MethodR.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** MethodR.java 18 Jul 2002 08:48:21 -0000 1.10 --- MethodR.java 22 Jul 2002 21:51:59 -0000 1.11 *************** *** 302,306 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 302,306 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: MonThreadMethodR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadMethodR.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** MonThreadMethodR.java 18 Jul 2002 08:48:21 -0000 1.7 --- MonThreadMethodR.java 22 Jul 2002 21:51:59 -0000 1.8 *************** *** 77,81 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 77,81 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>TypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 134,138 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 134,138 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: MonThreadTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonThreadTraceR.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** MonThreadTraceR.java 11 Jul 2002 18:17:23 -0000 1.6 --- MonThreadTraceR.java 22 Jul 2002 21:51:59 -0000 1.7 *************** *** 70,74 **** /** Constructs multi-rooted object ! * @param typeId Identification of <code>AllocTypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should --- 70,74 ---- /** Constructs multi-rooted object ! * @param typeId Identification of <code>ATypeR</code> object. Should * be null if N/A. * @param threadId Identification of <code>ThreadR</code> object. Should *************** *** 121,125 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 121,125 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: MonTraceR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/MonTraceR.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** MonTraceR.java 18 Jul 2002 08:48:21 -0000 1.8 --- MonTraceR.java 22 Jul 2002 21:51:59 -0000 1.9 *************** *** 167,171 **** } ! public AllocTypeR getTypeR() { return null; } --- 167,171 ---- } ! public TypeR getTypeR() { return null; } Index: ThreadGroupR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadGroupR.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** ThreadGroupR.java 18 Jul 2002 08:48:21 -0000 1.7 --- ThreadGroupR.java 22 Jul 2002 21:51:59 -0000 1.8 *************** *** 117,121 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 117,121 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } Index: ThreadR.java =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime/ThreadR.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** ThreadR.java 18 Jul 2002 08:48:21 -0000 1.10 --- ThreadR.java 22 Jul 2002 21:51:59 -0000 1.11 *************** *** 317,321 **** * </code> if this root is N / A. */ ! public AllocTypeR getTypeR() { return null; } --- 317,321 ---- * </code> if this root is N / A. */ ! public TypeR getTypeR() { return null; } |
|
From: Pavel V. <va...@us...> - 2002-07-22 21:51:10
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/realtime In directory usw-pr-cvs1:/tmp/cvs-serv18829 Removed Files: AllocTypeR.java Log Message: rename AllocTypeR -> TypeR --- AllocTypeR.java DELETED --- |
|
From: Pavel V. <va...@us...> - 2002-07-22 17:52:51
|
Update of /cvsroot/javaprofiler/test/module
In directory usw-pr-cvs1:/tmp/cvs-serv6757
Modified Files:
TestAllocHistView.java
Log Message:
realtime
Index: TestAllocHistView.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/module/TestAllocHistView.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TestAllocHistView.java 22 Jul 2002 00:20:58 -0000 1.1
--- TestAllocHistView.java 22 Jul 2002 17:52:48 -0000 1.2
***************
*** 39,44 ****
JFrame frame;
! //RefreshThread refreshTread;
!
/** Creates a new instance of TestAllocHistView */
public TestAllocHistView() {
--- 39,44 ----
JFrame frame;
! RefreshThread refreshThread;
!
/** Creates a new instance of TestAllocHistView */
public TestAllocHistView() {
***************
*** 46,56 ****
VirtualMachineRef vm = connect();
! //FIXME WARNING depends on iplementation
! image = (VirtualMachineImageRef) vm;
! ((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR)
! ((net.sourceforge.javaprofiler.jpiimpl.VirtualMachineImpl) vm).
! getRealtimeImage() ).refreshTypes();
!
//image = getSnapshot(vm);
--- 46,54 ----
VirtualMachineRef vm = connect();
! image = vm.getRealtimeImage();
! ((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
! refreshTypes();
! refreshThread = new RefreshThread();
//image = getSnapshot(vm);
***************
*** 72,79 ****
//System.err.println( e.getMessage() );
//e.printStackTrace();
! throw new RuntimeException( "Error in connecting to profiled machine: " + e.getMessage() );
}
}
private Snapshot getSnapshot( VirtualMachineRef vm ) {
--- 70,92 ----
//System.err.println( e.getMessage() );
//e.printStackTrace();
! throw new RuntimeException( "Error in connecting to profiled machine: " + e.getMessage() );
}
}
+ private class RefreshThread extends Thread {
+ java.util.List types;
+ public RefreshThread() {
+ types = image.getTypes();
+ }
+ public void run () {
+ ((net.sourceforge.javaprofiler.jpiimpl.realtime.ImageR) image).
+ refreshTypes();
+ try {
+ sleep(1000);
+ }
+ catch ( InterruptedException e ) {
+ }
+ }
+ }
private Snapshot getSnapshot( VirtualMachineRef vm ) {
***************
*** 122,125 ****
--- 135,139 ----
public void show() {
+ refreshThread.start();
//frame.pack();
frame.show();
***************
*** 135,139 ****
}
-
- //TODO
- //refreshing thread
\ No newline at end of file
--- 149,150 ----
|