javaprofiler-commits Mailing List for Java Profiling Tool (Page 23)

Status: Beta

Brought to you by: luner, marek, michalpise, petrul, and 2 others

javaprofiler-commits — CVS activity notification list

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (73)	_Sep (92)	_Oct (9)	_Nov (80)	_Dec (60)
2002	_Jan (92)	_Feb (52)	_Mar (71)	_Apr (64)	_May (53)	_Jun (10)	_Jul (111)	_Aug (93)	_Sep (134)	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 21 22 23 24 25 .. 40 > >> (Page 23 of 40)

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module/data Session.java,1.1.1.1,1.2

From: Jan S. <st...@us...> - 2002-02-26 00:49:17

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data
In directory usw-pr-cvs1:/tmp/cvs-serv8238

Modified Files:
	Session.java 
Log Message:
Refactoring of Create snapshot action.

Index: Session.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data/Session.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Session.java	14 Oct 2001 22:18:16 -0000	1.1.1.1
--- Session.java	26 Feb 2002 00:49:14 -0000	1.2
***************
*** 2,7 ****
   *                         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/
   *
--- 2,7 ----
   *                         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/
   *
***************
*** 21,24 ****
--- 21,29 ----
  package net.sourceforge.javaprofiler.module.data;
  
+ import java.text.MessageFormat;
+ 
+ import org.openide.util.NbBundle;
+ 
+ import net.sourceforge.javaprofiler.jpi.Snapshot;
  import net.sourceforge.javaprofiler.jpi.VirtualMachine;
  
***************
*** 35,38 ****
--- 40,45 ----
      /** Mirror of the virtual machine. */
      private VirtualMachine vm;
+     /** No. of snapshots created from this session. */
+     private int snapshots=0;
      
      /**
***************
*** 74,82 ****
          return vm;
      }
! 
  }
  
  /*
   * $Log$
   * Revision 1.1.1.1  2001/10/14 22:18:16  stolis
   * The very first version of profiler module.
--- 81,104 ----
          return vm;
      }
!     
!     /**
!      * Creates snapshot from this session.
!      */
!     public void createSnapshot() {
!         Snapshot snapshot=getVM().createSnapshot();
!         String name=MessageFormat.format(
!         NbBundle.getBundle(Session.class).getString("LBL_snapshot"),
!         new Object[] {new Integer(++snapshots), getName()});
!         snapshot.setName(name);
!         ProfilerData.getData().addSnapshot(new net.sourceforge.javaprofiler.module.data.Snapshot(snapshot));
!     }
!     
  }
  
  /*
   * $Log$
+  * Revision 1.2  2002/02/26 00:49:14  stolis
+  * Refactoring of Create snapshot action.
+  *
   * Revision 1.1.1.1  2001/10/14 22:18:16  stolis
   * The very first version of profiler module.

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module/actions SaveSnapshotAction.java,NONE,1.1 CloseSnapshotAction.java,NONE,1.1 Bundle.properties,1.2,1.3

From: Jan S. <st...@us...> - 2002-02-26 00:47:06

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions
In directory usw-pr-cvs1:/tmp/cvs-serv7821

Modified Files:
	Bundle.properties 
Added Files:
	SaveSnapshotAction.java CloseSnapshotAction.java 
Log Message:
Save and Close snapshot actions.

--- NEW FILE: SaveSnapshotAction.java ---
/*
 *                         Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License Version 
 * 1.0 (the "License"). You may not use this file except in compliance with 
 * the License. A copy of the License is available at http://www.sun.com/
 *
 * The Original Code is the Java Profiler module.
 * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha,
 * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek.
 * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved.
 *
 * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 *               Lukas Petru and Marek Przeczek.
 */
package net.sourceforge.javaprofiler.module.actions;

import java.io.IOException;
import javax.swing.Action;

import org.openide.TopManager;
import org.openide.nodes.Node;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.actions.CookieAction;

/**
 * Action that saves selected snapshot.
 *
 * @author Jan Stola
 */
public class SaveSnapshotAction extends CookieAction {
    
    protected Class[] cookieClasses() {
        return new Class[]{SnapshotCookie.class};
    }
    
    protected int mode() {
        return MODE_EXACTLY_ONE;
    }
    
    protected void performAction(Node[] nodes) {
        if (nodes.length!=0) {
            SnapshotCookie cookie=(SnapshotCookie)nodes[0].getCookie(SnapshotCookie.class);
            try {
                cookie.save();
            } catch (IOException e) {
                TopManager.getDefault().notifyException(e);
            }
        }            
    }
    
    public String getName() {
        return NbBundle.getMessage(SaveSnapshotAction.class, "LBL_saveSnapshotAction");
    }
    
    protected String iconResource() {
        return "/net/sourceforge/javaprofiler/module/resources/SaveSnapshotActionIcon.gif";
    }
    
    public HelpCtx getHelpCtx() {
        return new HelpCtx(SaveSnapshotAction.class);
    }
    
    protected void initialize() {
        super.initialize();
        putProperty(Action.SHORT_DESCRIPTION, NbBundle.getMessage(SaveSnapshotAction.class, "HINT_saveSnapshotAction"));
    }
    
}

/*
 * $Log: SaveSnapshotAction.java,v $
 * Revision 1.1  2002/02/26 00:47:03  stolis
 * Save and Close snapshot actions.
 *
 */
--- NEW FILE: CloseSnapshotAction.java ---
/*
 *                         Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License Version 
 * 1.0 (the "License"). You may not use this file except in compliance with 
 * the License. A copy of the License is available at http://www.sun.com/
 *
 * The Original Code is the Java Profiler module.
 * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha,
 * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek.
 * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved.
 *
 * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 *               Lukas Petru and Marek Przeczek.
 */
package net.sourceforge.javaprofiler.module.actions;

import javax.swing.Action;

import org.openide.nodes.Node;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.actions.CookieAction;

/**
 * Action that closes selected snapshots.
 *
 * @author Jan Stola
 */
public class CloseSnapshotAction extends CookieAction {
    
    protected Class[] cookieClasses() {
        return new Class[]{SnapshotCookie.class};
    }
    
    protected int mode() {
        return MODE_ALL;
    }
    
    protected void performAction(Node[] nodes) {
        for (int i=0; i<nodes.length; i++) {            
            SnapshotCookie cookie=(SnapshotCookie)nodes[i].getCookie(SnapshotCookie.class);
            cookie.close();
        }
    }
    
    public String getName() {
        return NbBundle.getMessage(CloseSnapshotAction.class, "LBL_closeSnapshotAction");
    }
    
    protected String iconResource() {
        return "/net/sourceforge/javaprofiler/module/resources/CloseSnapshotActionIcon.gif";
    }
    
    public HelpCtx getHelpCtx() {
        return new HelpCtx(CloseSnapshotAction.class);
    }
    
    protected void initialize() {
        super.initialize();
        putProperty(Action.SHORT_DESCRIPTION, NbBundle.getMessage(CloseSnapshotAction.class, "HINT_closeSnapshotAction"));
    }
    
}

/*
 * $Log: CloseSnapshotAction.java,v $
 * Revision 1.1  2002/02/26 00:47:03  stolis
 * Save and Close snapshot actions.
 *
 */
Index: Bundle.properties
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions/Bundle.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Bundle.properties	27 Jan 2002 23:21:36 -0000	1.2
--- Bundle.properties	26 Feb 2002 00:47:03 -0000	1.3
***************
*** 69,70 ****
--- 69,78 ----
  
  HINT_snapshotSessionAction=Creates snapshots of the selected sessions.
+ 
+ LBL_closeSnapshotAction=Close
+ 
+ HINT_closeSnapshotAction=Closes selected snapshots.
+ 
+ HINT_saveSnapshotAction=Saves selected snapshot.
+ 
+ LBL_saveSnapshotAction=Save

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module/actions SnapshotCookie.java,1.1,1.2

From: Jan S. <st...@us...> - 2002-02-26 00:46:23

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions
In directory usw-pr-cvs1:/tmp/cvs-serv7681

Modified Files:
	SnapshotCookie.java 
Log Message:
Close and save methods added through CloseCookie and SaveCookie.

Index: SnapshotCookie.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions/SnapshotCookie.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SnapshotCookie.java	27 Jan 2002 23:17:51 -0000	1.1
--- SnapshotCookie.java	26 Feb 2002 00:46:20 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
  package net.sourceforge.javaprofiler.module.actions;
  
+ import org.openide.cookies.*;
  import org.openide.nodes.Node;
  
***************
*** 28,37 ****
   * @author Jan Stola
   */
! public interface SnapshotCookie extends Node.Cookie {
!         
  }
  
  /*
   * $Log$
   * Revision 1.1  2002/01/27 23:17:51  stolis
   * Cookie for snapshot.
--- 29,41 ----
   * @author Jan Stola
   */
! public interface SnapshotCookie extends CloseCookie, SaveCookie {
!             
  }
  
  /*
   * $Log$
+  * Revision 1.2  2002/02/26 00:46:20  stolis
+  * Close and save methods added through CloseCookie and SaveCookie.
+  *
   * Revision 1.1  2002/01/27 23:17:51  stolis
   * Cookie for snapshot.

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module/actions SnapshotAction.java,1.1,1.2

From: Jan S. <st...@us...> - 2002-02-26 00:44:54

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions
In directory usw-pr-cvs1:/tmp/cvs-serv7343

Modified Files:
	SnapshotAction.java 
Log Message:
Refactoring of snapshot action.

Index: SnapshotAction.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/actions/SnapshotAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SnapshotAction.java	27 Jan 2002 23:18:26 -0000	1.1
--- SnapshotAction.java	26 Feb 2002 00:44:51 -0000	1.2
***************
*** 27,31 ****
  import org.openide.util.actions.CallableSystemAction;
  
- import net.sourceforge.javaprofiler.jpi.Snapshot;
  import net.sourceforge.javaprofiler.module.data.Session;
  import net.sourceforge.javaprofiler.module.data.ProfilerData;
--- 27,30 ----
***************
*** 41,46 ****
          Session session=ProfilerData.getData().currentSession();
          if (session!=null) {
!             Snapshot snapshot=session.getVM().createSnapshot();
!             ProfilerData.getData().addSnapshot(new net.sourceforge.javaprofiler.module.data.Snapshot(snapshot));
          }
      }
--- 40,44 ----
          Session session=ProfilerData.getData().currentSession();
          if (session!=null) {
!             session.createSnapshot();
          }
      }
***************
*** 67,70 ****
--- 65,71 ----
  /*
   * $Log$
+  * Revision 1.2  2002/02/26 00:44:51  stolis
+  * Refactoring of snapshot action.
+  *
   * Revision 1.1  2002/01/27 23:18:26  stolis
   * Snapshot action.

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module/resources SaveSnapshotActionIcon.gif,NONE,1.1 CloseSnapshotActionIcon.gif,NONE,1.1

From: Jan S. <st...@us...> - 2002-02-26 00:42:17

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources
In directory usw-pr-cvs1:/tmp/cvs-serv6761

Added Files:
	SaveSnapshotActionIcon.gif CloseSnapshotActionIcon.gif 
Log Message:
Icons for close and save actions.

--- NEW FILE: SaveSnapshotActionIcon.gif ---
GIF89a
Å×@TCQcq=fïtBN8X«gËD
--- NEW FILE: CloseSnapshotActionIcon.gif ---
GIF89a
Å×@TCQcq=fïtBN8X«gËD

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module/resources SnapshotDataIcon32.gif,NONE,1.1 SnapshotDataIcon.gif,NONE,1.1

From: Jan S. <st...@us...> - 2002-02-26 00:36:58

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources
In directory usw-pr-cvs1:/tmp/cvs-serv5553

Added Files:
	SnapshotDataIcon32.gif SnapshotDataIcon.gif 
Log Message:
Icons for snapshot data.

--- NEW FILE: SnapshotDataIcon32.gif ---
GIF89a 
~H,TVmh9
b-r*UG44	9]:z¬*
	g«3¢¤¯¹<µÀ®i&Æ& ÉÊËÌ
--- NEW FILE: SnapshotDataIcon.gif ---
GIF89a
Å×@TCQcq=fïtBN8X«gËD

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module SnapshotDataObject.java,NONE,1.1 SnapshotDataNode.java,NONE,1.1 SnapshotDataLoaderBeanInfo.java,NONE,1.1 SnapshotDataLoader.java,NONE,1.1 Bundle.properties,1.1.1.1,1.2

From: Jan S. <st...@us...> - 2002-02-26 00:36:03

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module
In directory usw-pr-cvs1:/tmp/cvs-serv5269

Modified Files:
	Bundle.properties 
Added Files:
	SnapshotDataObject.java SnapshotDataNode.java 
	SnapshotDataLoaderBeanInfo.java SnapshotDataLoader.java 
Log Message:
Datasystem (loader, data object, node) for snapshots.

--- NEW FILE: SnapshotDataObject.java ---
/*
 *                         Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License Version 
 * 1.0 (the "License"). You may not use this file except in compliance with 
 * the License. A copy of the License is available at http://www.sun.com/
 *
 * The Original Code is the Java Profiler module.
 * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha,
 * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek.
 * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved.
 *
 * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 *               Lukas Petru and Marek Przeczek.
 */
package net.sourceforge.javaprofiler.module;

import java.io.*;

import org.openide.TopManager;
import org.openide.actions.*;
import org.openide.cookies.*;
import org.openide.filesystems.FileObject;
import org.openide.loaders.*;
import org.openide.nodes.*;
import org.openide.util.HelpCtx;

import net.sourceforge.javaprofiler.jpi.Snapshot;
import net.sourceforge.javaprofiler.module.data.ProfilerData;

/**
 * Represents a Snapshot object in the Repository.
 *
 * @author Jan Stola
 */
public class SnapshotDataObject extends MultiDataObject {
    
    public SnapshotDataObject(FileObject pf, SnapshotDataLoader loader) throws DataObjectExistsException {
        super(pf, loader);
        init();
    }
    
    private void init() {
        CookieSet cookies = getCookieSet();
        cookies.add(new OpenCookie() {
            public void open() {
                ObjectInputStream ois=null;
                try {
                    ois=new ObjectInputStream(getPrimaryFile().getInputStream());
                    Snapshot snapshot=(Snapshot)ois.readObject();
                    ProfilerData.getData().addSnapshot(new net.sourceforge.javaprofiler.module.data.Snapshot(snapshot));
                } catch (Exception e) {
                    TopManager.getDefault().notifyException(e);
                } finally {
                    try {
                        if (ois!=null) ois.close();
                    } catch (IOException e) {}                        
                }
            }
        });
    }
    
    public HelpCtx getHelpCtx() {
        return new HelpCtx(SnapshotDataObject.class);
    }
    
    protected Node createNodeDelegate() {
        return new SnapshotDataNode(this);
    }
    
}

/*
 * $Log: SnapshotDataObject.java,v $
 * Revision 1.1  2002/02/26 00:36:00  stolis
 * Datasystem (loader, data object, node) for snapshots.
 *
 */
--- NEW FILE: SnapshotDataNode.java ---
/*
 *                         Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License Version 
 * 1.0 (the "License"). You may not use this file except in compliance with 
 * the License. A copy of the License is available at http://www.sun.com/
 *
 * The Original Code is the Java Profiler module.
 * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha,
 * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek.
 * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved.
 *
 * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 *               Lukas Petru and Marek Przeczek.
 */
package net.sourceforge.javaprofiler.module;

import org.openide.actions.OpenAction;
import org.openide.util.actions.SystemAction;

/**
 * A node to representing snapshot in the Repository.
 *
 * @author Jan Stola
 */
public class SnapshotDataNode extends org.openide.loaders.DataNode {

    public SnapshotDataNode(SnapshotDataObject obj) {
        this(obj, org.openide.nodes.Children.LEAF);
    }

    public SnapshotDataNode(SnapshotDataObject obj, org.openide.nodes.Children ch) {
        super(obj, ch);
        setIconBase("/net/sourceforge/javaprofiler/module/resources/SnapshotDataIcon");
    }

    protected SnapshotDataObject getSnapshotDataObject() {
        return (SnapshotDataObject) getDataObject();
    }

    public SystemAction getDefaultAction () {
	return SystemAction.get(OpenAction.class);
    }
    
}

/*
 * $Log: SnapshotDataNode.java,v $
 * Revision 1.1  2002/02/26 00:36:00  stolis
 * Datasystem (loader, data object, node) for snapshots.
 *
 */
--- NEW FILE: SnapshotDataLoaderBeanInfo.java ---
/*
 *                         Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License Version 
 * 1.0 (the "License"). You may not use this file except in compliance with 
 * the License. A copy of the License is available at http://www.sun.com/
 *
 * The Original Code is the Java Profiler module.
 * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha,
 * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek.
 * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved.
 *
 * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 *               Lukas Petru and Marek Przeczek.
 */
package net.sourceforge.javaprofiler.module;

import java.awt.Image;
import java.beans.*;

import org.openide.TopManager;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;

/**
 * Description of {@link SnapshotDataLoader}.
 *
 * @author Jan Stola
 */
public class SnapshotDataLoaderBeanInfo extends SimpleBeanInfo {

    public BeanInfo[] getAdditionalBeanInfo () {
        try {
            return new BeanInfo[] { Introspector.getBeanInfo(SnapshotDataLoader.class.getSuperclass()) };
        } catch (IntrospectionException ie) {
            TopManager.getDefault().getErrorManager().notify(ie);
            return null;
        }
    }

    public Image getIcon(int type) {
        if (type==BeanInfo.ICON_COLOR_16x16||type==BeanInfo.ICON_MONO_16x16) {
            return Utilities.loadImage("/net/sourceforge/javaprofiler/module/resources/SnapshotDataIcon.gif");
        } else {
            return Utilities.loadImage("/net/sourceforge/javaprofiler/module/resources/SnapshotDataIcon32.gif");
        }
    }

}

/*
 * $Log: SnapshotDataLoaderBeanInfo.java,v $
 * Revision 1.1  2002/02/26 00:36:00  stolis
 * Datasystem (loader, data object, node) for snapshots.
 *
 */
--- NEW FILE: SnapshotDataLoader.java ---
/*
 *                         Sun Public License Notice
 *
 * The contents of this file are subject to the Sun Public License Version 
 * 1.0 (the "License"). You may not use this file except in compliance with 
 * the License. A copy of the License is available at http://www.sun.com/
 *
 * The Original Code is the Java Profiler module.
 * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha,
 * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek.
 * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved.
 * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved.
 *
 * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
 *               Lukas Petru and Marek Przeczek.
 */
package net.sourceforge.javaprofiler.module;

import java.io.IOException;

import org.openide.actions.*;
import org.openide.filesystems.*;
import org.openide.loaders.*;
import org.openide.util.NbBundle;
import org.openide.util.actions.SystemAction;

/**
 * Recognizes snapshot files.
 *
 * @author Jan Stola
 */
public class SnapshotDataLoader extends UniFileLoader {

    public SnapshotDataLoader() {
        this("net.sourceforge.javaprofiler.module.SnapshotDataObject");
    }
    
    protected SnapshotDataLoader(String recognizedObjectClass) {
        super(recognizedObjectClass);
    }

    protected String defaultDisplayName() {
        return NbBundle.getMessage(SnapshotDataLoader.class, "LBL_snapshotLoaderName");
    }

    protected void initialize() {
        super.initialize();
        ExtensionList extensions=new ExtensionList();
        extensions.addExtension("snapshot");
        setExtensions(extensions);
    }

    protected SystemAction[] defaultActions () {
        return new SystemAction[] {
            SystemAction.get (OpenAction.class),
            null,
            SystemAction.get (CutAction.class),
            SystemAction.get (CopyAction.class),
            SystemAction.get (PasteAction.class),
            null,
            SystemAction.get (DeleteAction.class),
            SystemAction.get (RenameAction.class),
            null,
            SystemAction.get (ToolsAction.class),
            SystemAction.get (PropertiesAction.class),
        };
    }

    protected MultiDataObject createMultiObject (FileObject primaryFile)
    throws DataObjectExistsException, IOException {
        return new SnapshotDataObject(primaryFile, this);
    }

}

/*
 * $Log: SnapshotDataLoader.java,v $
 * Revision 1.1  2002/02/26 00:36:00  stolis
 * Datasystem (loader, data object, node) for snapshots.
 *
 */
Index: Bundle.properties
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/Bundle.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Bundle.properties	14 Oct 2001 22:15:06 -0000	1.1.1.1
--- Bundle.properties	26 Feb 2002 00:36:00 -0000	1.2
***************
*** 74,75 ****
--- 74,80 ----
  HINT_alloc=Do you want to collect information about object allocations.
  LBL_settings=Profiler Settings
+ 
+ PROP_snapshotOnExit=Snapshot on Exit
+ 
+ HINT_snapshotOnExit=Create snapshot when session finishes.
+ LBL_loaderName=Snapshot Objects

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module ProfilerSettingsBeanInfo.java,1.1.1.1,1.2 ProfilerSettings.java,1.1.1.1,1.2

From: Jan S. <st...@us...> - 2002-02-26 00:34:25

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module
In directory usw-pr-cvs1:/tmp/cvs-serv4950

Modified Files:
	ProfilerSettingsBeanInfo.java ProfilerSettings.java 
Log Message:
Snapshot_on_exit property added.

Index: ProfilerSettingsBeanInfo.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/ProfilerSettingsBeanInfo.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ProfilerSettingsBeanInfo.java	14 Oct 2001 22:15:22 -0000	1.1.1.1
--- ProfilerSettingsBeanInfo.java	26 Feb 2002 00:34:22 -0000	1.2
***************
*** 43,50 ****
              workspace.setShortDescription(bundle.getString("HINT_workspace"));
              workspace.setPropertyEditorClass(WorkspaceEditor.class);
!             return new PropertyDescriptor[] {workspace};
          } catch (IntrospectionException ie) {
!             if (Boolean.getBoolean ("netbeans.debug.exceptions"))
!                 ie.printStackTrace ();
              return null;
          }
--- 43,52 ----
              workspace.setShortDescription(bundle.getString("HINT_workspace"));
              workspace.setPropertyEditorClass(WorkspaceEditor.class);
!             PropertyDescriptor snapshotOnExit=new PropertyDescriptor(ProfilerSettings.PROP_SNAPSHOT_ON_EXIT, ProfilerSettings.class);
!             snapshotOnExit.setDisplayName(bundle.getString("PROP_snapshotOnExit"));
!             snapshotOnExit.setShortDescription(bundle.getString("HINT_snapshotOnExit"));            
!             return new PropertyDescriptor[] {workspace, snapshotOnExit};
          } catch (IntrospectionException ie) {
!             ie.printStackTrace ();
              return null;
          }
***************
*** 68,71 ****
--- 70,76 ----
  /*
   * $Log$
+  * Revision 1.2  2002/02/26 00:34:22  stolis
+  * Snapshot_on_exit property added.
+  *
   * Revision 1.1.1.1  2001/10/14 22:15:22  stolis
   * The very first version of profiler module.

Index: ProfilerSettings.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/ProfilerSettings.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ProfilerSettings.java	14 Oct 2001 22:15:16 -0000	1.1.1.1
--- ProfilerSettings.java	26 Feb 2002 00:34:22 -0000	1.2
***************
*** 31,38 ****
   */
  public class ProfilerSettings extends SystemOption {
!     public static final String PROP_WORKSPACE="workspace";    
      
      protected void initialize () {
          setWorkspace("profiling");
      }
  
--- 31,40 ----
   */
  public class ProfilerSettings extends SystemOption {
!     public static final String PROP_WORKSPACE="workspace";
!     public static final String PROP_SNAPSHOT_ON_EXIT="snapshotOnExit";
      
      protected void initialize () {
          setWorkspace("profiling");
+         setSnapshotOnExit(true);
      }
  
***************
*** 59,62 ****
--- 61,72 ----
          putProperty(PROP_WORKSPACE, workspace, true);
      }
+     
+     public boolean getSnapshotOnExit() {
+         return ((Boolean)getProperty(PROP_SNAPSHOT_ON_EXIT)).booleanValue();
+     }
+ 
+     public void setSnapshotOnExit(boolean snapshotOnExit) {
+         putProperty(PROP_SNAPSHOT_ON_EXIT, new Boolean(snapshotOnExit), true);
+     }    
  
  }
***************
*** 64,67 ****
--- 74,80 ----
  /*
   * $Log$
+  * Revision 1.2  2002/02/26 00:34:22  stolis
+  * Snapshot_on_exit property added.
+  *
   * Revision 1.1.1.1  2001/10/14 22:15:16  stolis
   * The very first version of profiler module.

[Javaprofiler-commits] CVS: module/net/sourceforge/javaprofiler/module ProfilerExecutor.java,1.1.1.1,1.2

From: Jan S. <st...@us...> - 2002-02-26 00:32:29

Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module
In directory usw-pr-cvs1:/tmp/cvs-serv4484

Modified Files:
	ProfilerExecutor.java 
Log Message:
Forgotten '=' characters added.

Index: ProfilerExecutor.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/ProfilerExecutor.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ProfilerExecutor.java	14 Oct 2001 22:15:16 -0000	1.1.1.1
--- ProfilerExecutor.java	26 Feb 2002 00:32:24 -0000	1.2
***************
*** 176,182 ****
          }
          if (!"".equals(getCommunShmemID())) {
!             options.append(',').append("commun_shmem_id").append(getCommunShmemID());
          }
!         options.append(',').append("connect_mode").append(modeName(getConnectMode()));
          return options.toString();
      }
--- 176,182 ----
          }
          if (!"".equals(getCommunShmemID())) {
!             options.append(',').append("commun_shmem_id=").append(getCommunShmemID());
          }
!         options.append(',').append("connect_mode=").append(modeName(getConnectMode()));
          return options.toString();
      }
***************
*** 547,550 ****
--- 547,553 ----
  /*
   * $Log$
+  * Revision 1.2  2002/02/26 00:32:24  stolis
+  * Forgotten '=' characters added.
+  *
   * Revision 1.1.1.1  2001/10/14 22:15:16  stolis
   * The very first version of profiler module.

[Javaprofiler-commits] CVS: test/snapshot TestNoSwing.java,1.1,1.2

From: Pavel V. <va...@us...> - 2002-02-22 17:16:44

Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv8534/test/snapshot

Modified Files:
	TestNoSwing.java 
Log Message:
pauses added


Index: TestNoSwing.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/TestNoSwing.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TestNoSwing.java	22 Feb 2002 13:33:33 -0000	1.1
--- TestNoSwing.java	22 Feb 2002 17:16:40 -0000	1.2
***************
*** 1,6 ****
! /* Some test, that doesn't require X console 
  */
  
  import java.util.*;
  
  class TestNoSwing {
--- 1,42 ----
! /* Some test, that can be ran wihtout X console 
  */
  
+ 
+ /*
+  *                         Sun Public License Notice
+  *
+  * The contents of this file are subject to the Sun Public License
+  * Version 1.0 (the "License"); you may not use this file except
+  * in compliance with the License. A copy of the License is available
+  * at http://www.sun.com/
+  *
+  * The Original Code is the Java Profiler module.  The Initial Developers
+  * of the Original Code are Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
+  * Lukas Petru and Marek Przeczek.
+  *
+  * Portions created by Jan Stola are Copyright (C) 2000-2001.
+  * All Rights Reserved.
+  *
+  * Portions created by Pavel Vacha are Copyright (C) 2000-2001.
+  * All Rights Reserved.
+  *
+  * Portions created by Michal Pise are Copyright (C) 2000-2001.
+  * All Rights Reserved.
+  *
+  * Portions created by Petr Luner are Copyright (C) 2000-2001.
+  * All Rights Reserved.
+  *
+  * Portions created by Lukas Petru are Copyright (C) 2000-2001.
+  * All Rights Reserved.
+  *
+  * Portions created by Marek Przeczek are Copyright (C) 2000-2001.
+  * All Rights Reserved.
+  *
+  * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner,
+  *               Lukas Petru and Marek Przeczek.
+  */
+ 
  import java.util.*;
+ import java.io.*;
  
  class TestNoSwing {
***************
*** 17,21 ****
      	int i;
  
! 	for (i = 1; i < 1000; i++) {
  	    set.add( new Double(Math.random()) );
  	}
--- 53,57 ----
      	int i;
  
! 	for (i = 1; i < 500; i++) {
  	    set.add( new Double(Math.random()) );
  	}
***************
*** 57,61 ****
  
  	System.out.println( "Start" );
! 	for (i = 1; i < 20; i++) {
  	    a.initSet();
  	    a.initList();
--- 93,105 ----
  
  	System.out.println( "Start" );
! 	System.err.print("Press a key");
!         try {
!             int c = System.in.read();
!         }
!  	catch (IOException ioe) {
! 	    System.err.println( "IOException caught:" + ioe );
! 	}
! 
!         for (i = 1; i < 20; i++) {
  	    a.initSet();
  	    a.initList();
***************
*** 63,67 ****
  	    System.out.print( i + " " );
          }
! 	System.out.println( "end" );
      }
  }
--- 107,119 ----
  	    System.out.print( i + " " );
          }
! 
! 	System.out.println( "end." );
! 	System.err.print("Press a key");
!         try {
!             int c = System.in.read();
!         }
!  	catch (IOException ioe) {
! 	    System.err.println( "IOException caught:" + ioe );
! 	}
      }
  }

[Javaprofiler-commits] CVS: test/snapshot TestNoSwing.java,NONE,1.1 build.xml,NONE,1.1 run3.bat,NONE,1.1

From: Pavel V. <va...@us...> - 2002-02-22 13:33:36

Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv18032

Added Files:
	TestNoSwing.java build.xml run3.bat 
Log Message:
the  test, that doesn't require X console 


--- NEW FILE: TestNoSwing.java ---
/* Some test, that doesn't require X console 
*/

import java.util.*;

class TestNoSwing {

    Set	     set;
    List     list;

    TestNoSwing() {
	set = new HashSet();
	list = new ArrayList();
    };

    void initSet() {
    	int i;

	for (i = 1; i < 1000; i++) {
	    set.add( new Double(Math.random()) );
	}
    };

    void initList() {
        Iterator it=set.iterator();
	Double	 d;
	

	while ( it.hasNext() ) {
	    d = (Double) it.next();
	    list.add( d );
	}
    };

    void sort() {
        SortedSet    tree=new TreeSet();
	Iterator     it=list.iterator();
	Double	     d;
	

	while ( it.hasNext() ) {
	    d = (Double) it.next();
	    tree.add( d );
	}

	it=list.iterator();
	while ( it.hasNext() ) {
	    d = (Double) it.next();
	    //System.out.print( d + " ");
	}

    }

    public static void main( String[] arg ) {
	TestNoSwing a = new TestNoSwing();	
	int i;

	System.out.println( "Start" );
	for (i = 1; i < 20; i++) {
	    a.initSet();
	    a.initList();
	    a.sort();
	    System.out.print( i + " " );
        }
	System.out.println( "end" );
    }
}

--- NEW FILE: build.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="compile" name="test jpiimpl">

    <target name="init">
        <tstamp/>
    <!-- You can set up any variables you want used throughout the script here. -->
    <!--  configuration ************************************************** -->

        <!-- Common classpath -->
        <path id="project.classpath">
            <pathelement location="../../jpiimpl/jpiimpl.jar"/>
        </path>

    </target>
    
    
    <target name="compile" depends="init" description="Compile .java files">
        <property name="cp" refid="project.classpath"/>
        <echo message="Classpath is ${cp}"/>
        <javac classpathref="project.classpath" debug="true" failonerror="true">
            <src>
                <pathelement location="."/>
            </src>
        </javac>
    </target>

    
    <target name="all" depends="init,compile" description="Build everything.">
        <echo message="Application built. "/>
    </target>

    
<!--    <target name="test" depends="init,all" description="Try running it.">
         <java classname="" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="."/>
             </classpath> -->
             <!-- Pass some args, perhaps: -->
             <!--<arg value="-myfile"/> -->
             <!-- Will be given as an absolute path: -->
             <!-- <arg file="myfile.txt"/> -->
<!--         </java>
     </target>  -->

    
    <target name="clean" depends="init" description="Clean all build products.">
        <delete>
            <fileset dir=".">
                <include name="*.class"/>
            </fileset>
        </delete>
    </target>
   
</project>

--- NEW FILE: run3.bat ---
SET JAVA_HOME=d:\j2sdk1.4.0-rc
rem **************************
SET CLASSPATH=.;%CLASSPATH%
set path=%JAVA_HOME%\bin;%path%
java -Xrun..\..\library\src\profiler\profiler:commun_type=socket TestNoSwing > out3.txt

[Javaprofiler-commits] CVS: jpiimpl readme.txt,1.3,1.4

From: Pavel V. <va...@us...> - 2002-02-22 13:28:13

Update of /cvsroot/javaprofiler/jpiimpl
In directory usw-pr-cvs1:/tmp/cvs-serv16399/jpiimpl

Modified Files:
	readme.txt 
Log Message:
target cleanall added


Index: readme.txt
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/readme.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** readme.txt	14 Feb 2002 09:07:27 -0000	1.3
--- readme.txt	22 Feb 2002 13:28:08 -0000	1.4
***************
*** 20,27 ****
  -------
  compile     compilation
! jar         makes jar package
! javadoc     genarates documentation
! doxygen     generates doxygen documentation
! clean       cleaning
  all         all this
  
--- 20,28 ----
  -------
  compile     compilation
! jar         make jar package
! javadoc     genarate documentation
! doxygen     generate doxygen documentation
! clean       clean built products
! cleanall    clean build products and generated documentation
  all         all this
  
***************
*** 29,35 ****
  Example:
  -------
! set JAVA_HOME=d:\j2sdk1.4.0-rc 
  set CLASSPATH=%CLASSPATH%;d:\netbeans\modules\ant.jar;%JAVA_HOME%\lib\tools.jar
! d:\j2sdk1.4.0-rc\bin\java org.apache.tools.ant.Main 
  
  
--- 30,36 ----
  Example:
  -------
! set JAVA_HOME=d:\j2sdk1.4.0 
  set CLASSPATH=%CLASSPATH%;d:\netbeans\modules\ant.jar;%JAVA_HOME%\lib\tools.jar
! d:\j2sdk1.4.0\bin\java org.apache.tools.ant.Main 
  
  
***************
*** 37,38 ****
--- 38,42 ----
  If you do not have any Ant, you can get it from 
  http://jakarta.apache.org/builds/jakarta-ant/release/v1.4.1/bin/
+ 
+ Doxygen can be dowloaded from 
+ http://www.stack.nl/~dimitri/doxygen/

[Javaprofiler-commits] CVS: library/src/cpu sampling.h,1.9,1.10 sampling.cpp,1.10,1.11

From: Petr L. <lu...@us...> - 2002-02-18 20:18:06

Update of /cvsroot/javaprofiler/library/src/cpu
In directory usw-pr-cvs1:/tmp/cvs-serv3458

Modified Files:
	sampling.h sampling.cpp 
Log Message:
no message

Index: sampling.h
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/cpu/sampling.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** sampling.h	21 Nov 2001 22:31:43 -0000	1.9
--- sampling.h	18 Feb 2002 20:17:59 -0000	1.10
***************
*** 80,83 ****
--- 80,91 ----
  #endif
  
+ private:
+ 
+ 	/// helper array of frames used in call tree building
+ 	JVMPI_CallFrame *ctFrames;
+ 
+ 	/// number of frames in 'ctFrames' array
+ 	long ctFramesCount;
+ 
  public:
  

Index: sampling.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/cpu/sampling.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** sampling.cpp	21 Nov 2001 22:31:42 -0000	1.10
--- sampling.cpp	18 Feb 2002 20:17:59 -0000	1.11
***************
*** 65,68 ****
--- 65,71 ----
  	samples = 0;
  #endif
+ 
+ 	ctFrames = NULL;
+ 	ctFramesCount = 0;
  }
  
***************
*** 78,81 ****
--- 81,86 ----
  #endif
  #endif
+ 
+ 	if (ctFrames) delete[] ctFrames;
  }
  
***************
*** 267,270 ****
--- 272,338 ----
  #endif // !USE_RAW_MONITORS
  
+ void RecordCallTreeBranch(CallTree *callTree, JVMPI_CallFrame *frames, long numFrames)
+ {
+ 	Prof* _prof = &Prof::prof();
+ 	jmethodID methodId;
+ 	Method *method;
+ 	CallTreeItem *p, *parent;
+ 	long i;
+ 
+ 	if (numFrames == 0)
+ 		return;
+ 
+ 	if (!callTree->root) {
+ 
+ 		methodId = frames[numFrames - 1].method_id;
+ 
+ 		if (!(method = _prof->getMethod(methodId)))
+ 			return;
+ 
+ 		p = new CallTreeItem;
+ 
+ 		p->method = method;
+ 		p->parent = NULL;
+ 		p->hits = 1;
+ 
+ 		callTree->root = p;
+ 	}
+ 	else callTree->root->hits++;
+ 
+ 	parent = callTree->root;
+ 	for (i = numFrames - 2; i >= 0; i--) {
+ 
+ 		methodId = frames[i].method_id;
+ 
+ 		p = parent->children.first();
+ 		while (p) {
+ 			if (p->method && p->method->isActive() && (*p->method == methodId))
+ 				break;
+ 			p = parent->children.next(p);
+ 		}
+ 
+ 		if (p) {
+ 			
+ 			parent->children.add(parent->children.remove(p));
+ 			p->hits++;
+ 		}
+ 		else {
+ 
+ 			if (!(method = _prof->getMethod(methodId)))
+ 				return;
+ 
+ 			p = new CallTreeItem;
+ 
+ 			p->method = method;
+ 			p->parent = parent;
+ 			p->hits = 1;
+ 
+ 			parent->children.add(p);
+ 		}
+ 
+ 		parent = p;
+ 	}
+ }
+ 
  void Sampling::doOneSample() {
  
***************
*** 279,282 ****
--- 347,351 ----
  	int numFrames;
  	CpuStatData* stat;
+ 	JVMPI_CallTrace ctTrace;
  
  #ifdef _DEBUG
***************
*** 315,318 ****
--- 384,422 ----
  			
  			_prof->jvmpiInterface->GetCallTrace(trace, traceDepth);
+ 
+ 			/////////////////////////////////////////////////
+ 			// call tree
+ 
+ 			if (_prof->setup.cpu.callTreeEnabled) {
+ 
+ 				if (!ctFrames) {
+ 
+ 					ctFramesCount = 100;
+ 					ctFrames = new JVMPI_CallFrame[ctFramesCount];
+ 				}
+ 
+ 				do {
+ 
+ 					ctTrace.env_id = envId;
+ 					ctTrace.frames = ctFrames;
+ 					ctTrace.num_frames = ctFramesCount;
+ 
+ 					_prof->jvmpiInterface->GetCallTrace(&ctTrace, ctFramesCount);
+ 
+ 					if (ctTrace.num_frames == ctFramesCount) {
+ 
+ 						delete[] ctFrames;
+ 						
+ 						ctFramesCount *= 2;
+ 						ctFrames = new JVMPI_CallFrame[ctFramesCount];
+ 					}
+ 
+ 				} while (ctTrace.num_frames == ctFramesCount);
+ 
+ 				if (ctTrace.num_frames > 0)
+ 					RecordCallTreeBranch(&thread->callTree, ctFrames, ctTrace.num_frames); 
+ 			}
+ 
+ 			/////////////////////////////////////////////////
  		}
  	}

[Javaprofiler-commits] CVS: test/snapshot DebugOutput.java,1.3,1.4

From: Pavel V. <va...@us...> - 2002-02-16 16:22:20

Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv18494

Modified Files:
	DebugOutput.java 
Log Message:
code refacorization Class.. to Type...  (forgotten methods)

Index: DebugOutput.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/DebugOutput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** DebugOutput.java	15 Feb 2002 22:38:09 -0000	1.3
--- DebugOutput.java	16 Feb 2002 16:22:18 -0000	1.4
***************
*** 80,84 ****
              AllocTypeData o = (AllocTypeData) it.next();
              System.out.println("OBJECT TYPE:");
!             ClassData c = o.getClassData();
              if (c != null)  System.out.println("CLASS = " + c.getName());
              System.out.print("IS_ARRAY = ");
--- 80,84 ----
              AllocTypeData o = (AllocTypeData) it.next();
              System.out.println("OBJECT TYPE:");
!             ClassData c = o.getClazz();
              if (c != null)  System.out.println("CLASS = " + c.getName());
              System.out.print("IS_ARRAY = ");
***************
*** 213,217 ****
          while (it.hasNext()) {
              ThreadData th = (ThreadData) it.next();
!             Iterator itA = th.getClasses().values().iterator();
              while (itA.hasNext()) {
                  AllocThreadTypeData a = (AllocThreadTypeData) itA.next();
--- 213,217 ----
          while (it.hasNext()) {
              ThreadData th = (ThreadData) it.next();
!             Iterator itA = th.getTypes().values().iterator();
              while (itA.hasNext()) {
                  AllocThreadTypeData a = (AllocThreadTypeData) itA.next();
***************
*** 296,299 ****
--- 296,302 ----
  /*
   * $Log$
+  * Revision 1.4  2002/02/16 16:22:18  vachis
+  * code refacorization Class.. to Type...  (forgotten methods)
+  *
   * Revision 1.3  2002/02/15 22:38:09  vachis
   * code refactorization Class..Data renamed to Type..Data

[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data ThreadData.java,1.13,1.14 SnapshotImpl.java,1.10,1.11 MethodData.java,1.12,1.13 AllocTypeData.java,1.2,1.3

From: Pavel V. <va...@us...> - 2002-02-16 16:21:57

Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv18356

Modified Files:
	ThreadData.java SnapshotImpl.java MethodData.java 
	AllocTypeData.java 
Log Message:
code refacorization Class.. to Type...  (forgotten methods)

Index: ThreadData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/ThreadData.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** ThreadData.java	15 Feb 2002 22:37:30 -0000	1.13
--- ThreadData.java	16 Feb 2002 16:21:52 -0000	1.14
***************
*** 48,52 ****
       * Mapping of {@link AllocThreadClassData} objects and class IDs.
       */
!     private Map classes;
      /**
       * Map of methods invoked in this thread.
--- 48,52 ----
       * Mapping of {@link AllocThreadClassData} objects and class IDs.
       */
!     private Map types;
      /**
       * Map of methods invoked in this thread.
***************
*** 83,87 ****
          this.active=active;
          children=new LinkedList();
!         classes=new HashMap();
          allocMethods=new HashMap();
          CPUMethods=new HashMap();
--- 83,87 ----
          this.active=active;
          children=new LinkedList();
!         types=new HashMap();
          allocMethods=new HashMap();
          CPUMethods=new HashMap();
***************
*** 183,188 ****
       * @return mapping of {@link AllocThreadClassData} objects and class IDs.
       */
!     public Map getClasses() {
!         return classes;
      }
      
--- 183,188 ----
       * @return mapping of {@link AllocThreadClassData} objects and class IDs.
       */
!     public Map getTypes() {
!         return types;
      }
      
***************
*** 193,199 ****
       * @param allocClass allocClass that were allocated in this thread.
       */
!     void addClass(AllocThreadTypeData allocClass) {
          //FIXME:
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
  
--- 193,199 ----
       * @param allocClass allocClass that were allocated in this thread.
       */
!     void addType(AllocThreadTypeData allocClass) {
          //FIXME:
!         types.put(new Integer(allocClass.getID()), allocClass);
      }
  
***************
*** 206,211 ****
       * in this thread or <code>null</code> if such class does not exist.
       */    
!     public AllocThreadTypeData getClass(int ID) {
!         return (AllocThreadTypeData)classes.get(new Integer(ID));
      }        
  
--- 206,211 ----
       * in this thread or <code>null</code> if such class does not exist.
       */    
!     public AllocThreadTypeData getType(int ID) {
!         return (AllocThreadTypeData)types.get(new Integer(ID));
      }        
  
***************
*** 300,303 ****
--- 300,306 ----
  /*
   * $Log$
+  * Revision 1.14  2002/02/16 16:21:52  vachis
+  * code refacorization Class.. to Type...  (forgotten methods)
+  *
   * Revision 1.13  2002/02/15 22:37:30  vachis
   * code refactorization Class..Data renamed to Type..Data

Index: SnapshotImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/SnapshotImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** SnapshotImpl.java	15 Feb 2002 22:37:30 -0000	1.10
--- SnapshotImpl.java	16 Feb 2002 16:21:52 -0000	1.11
***************
*** 728,732 ****
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocTypeMethodData newObj = new AllocTypeMethodData( sid, up, lf ); 
!                 lf.addClass( newObj );
                  up.addMethod( newObj );
                  return newObj;
--- 728,732 ----
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocTypeMethodData newObj = new AllocTypeMethodData( sid, up, lf ); 
!                 lf.addType( newObj );
                  up.addMethod( newObj );
                  return newObj;
***************
*** 737,741 ****
                  AllocTypeData up = (AllocTypeData) refObj;
                  AllocTypeMethodData newObj = new AllocTypeMethodData( sid, up, lf );
!                 lf.addClass( newObj );
                  up.addMethod( newObj );
                  return newObj;
--- 737,741 ----
                  AllocTypeData up = (AllocTypeData) refObj;
                  AllocTypeMethodData newObj = new AllocTypeMethodData( sid, up, lf );
!                 lf.addType( newObj );
                  up.addMethod( newObj );
                  return newObj;
***************
*** 765,769 ****
                  ThreadData up = (ThreadData) libIDs.get( new Integer( sid.parentUpObjId));
                  AllocThreadTypeData newObj = new AllocThreadTypeData( sid, up, lf ); 
!                 up.addClass( newObj );
                  lf.addThread( newObj );
                  return newObj;
--- 765,769 ----
                  ThreadData up = (ThreadData) libIDs.get( new Integer( sid.parentUpObjId));
                  AllocThreadTypeData newObj = new AllocThreadTypeData( sid, up, lf ); 
!                 up.addType( newObj );
                  lf.addThread( newObj );
                  return newObj;
***************
*** 775,779 ****
                  AllocThreadTypeData newObj = new AllocThreadTypeData( sid, up, lf ); 
                  lf.addThread( newObj );
!                 up.addClass( newObj );
                  return newObj;
              }
--- 775,779 ----
                  AllocThreadTypeData newObj = new AllocThreadTypeData( sid, up, lf ); 
                  lf.addThread( newObj );
!                 up.addType( newObj );
                  return newObj;
              }
***************
*** 1036,1039 ****
--- 1036,1042 ----
  /*
   * $Log$
+  * Revision 1.11  2002/02/16 16:21:52  vachis
+  * code refacorization Class.. to Type...  (forgotten methods)
+  *
   * Revision 1.10  2002/02/15 22:37:30  vachis
   * code refactorization Class..Data renamed to Type..Data

Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** MethodData.java	16 Feb 2002 14:05:31 -0000	1.12
--- MethodData.java	16 Feb 2002 16:21:53 -0000	1.13
***************
*** 76,80 ****
       * Mapping of {@link AllocClassMethodData} objects and class IDs.
       */
!     private Map classes;
      /**
       * Map of traces of this method.
--- 76,80 ----
       * Mapping of {@link AllocClassMethodData} objects and class IDs.
       */
!     private Map types;
      /**
       * Map of traces of this method.
***************
*** 122,126 ****
          allocThreads = Collections.EMPTY_MAP;
          CPUTraces= Collections.EMPTY_MAP; 
!         classes = Collections.EMPTY_MAP;
          CPUThreads = Collections.EMPTY_MAP;
          MonTraces = Collections.EMPTY_MAP; 
--- 122,126 ----
          allocThreads = Collections.EMPTY_MAP;
          CPUTraces= Collections.EMPTY_MAP; 
!         types = Collections.EMPTY_MAP;
          CPUThreads = Collections.EMPTY_MAP;
          MonTraces = Collections.EMPTY_MAP; 
***************
*** 297,302 ****
       * @return mapping of {@link AllocClassMethodData} objects and class IDs.
       */
!     public Map getClasses() {
!         return classes;
      }
      
--- 297,302 ----
       * @return mapping of {@link AllocClassMethodData} objects and class IDs.
       */
!     public Map getTypes() {
!         return types;
      }
      
***************
*** 307,314 ****
       * @param allocClass allocClass that were allocated in this method.
       */
!     void addClass(AllocTypeMethodData allocClass) {   
!         if ( classes == Collections.EMPTY_MAP )
!             classes = new HashMap();
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
--- 307,314 ----
       * @param allocClass allocClass that were allocated in this method.
       */
!     void addType(AllocTypeMethodData allocClass) {   
!         if ( types == Collections.EMPTY_MAP )
!             types = new HashMap();
!         types.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 321,326 ****
       * in this method or <code>null</code> if such class does not exist.
       */
!     public AllocTypeMethodData getClass(int ID) {
!         return (AllocTypeMethodData)classes.get(new Integer(ID));
      }
      
--- 321,326 ----
       * in this method or <code>null</code> if such class does not exist.
       */
!     public AllocTypeMethodData getType(int ID) {
!         return (AllocTypeMethodData)types.get(new Integer(ID));
      }
      
***************
*** 548,551 ****
--- 548,554 ----
  /*
   * $Log$
+  * Revision 1.13  2002/02/16 16:21:53  vachis
+  * code refacorization Class.. to Type...  (forgotten methods)
+  *
   * Revision 1.12  2002/02/16 14:05:31  vachis
   * perfomance fix, use EMPY_MAP

Index: AllocTypeData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** AllocTypeData.java	16 Feb 2002 14:05:31 -0000	1.2
--- AllocTypeData.java	16 Feb 2002 16:21:53 -0000	1.3
***************
*** 31,35 ****
  public class AllocTypeData extends AllocAbstractStatThreadClassData {
      /** Class to which this allocation data belongs. */
!     private ClassData classData;
      /**
       * Type of the class (for example JVMPI_NORMAL_OBJECT, JVMPI_CLASS,
--- 31,35 ----
  public class AllocTypeData extends AllocAbstractStatThreadClassData {
      /** Class to which this allocation data belongs. */
!     private ClassData clazz;
      /**
       * Type of the class (for example JVMPI_NORMAL_OBJECT, JVMPI_CLASS,
***************
*** 58,62 ****
      AllocTypeData(int ID, ClassData classData, int type) {
          super(ID);
!         this.classData=classData;
          this.arrayType=type;
          methods=new HashMap(); //??use EMPTY_MAP 
--- 58,62 ----
      AllocTypeData(int ID, ClassData classData, int type) {
          super(ID);
!         this.clazz=classData;
          this.arrayType=type;
          methods=new HashMap(); //??use EMPTY_MAP 
***************
*** 81,86 ****
       * @return class to which this allocation data belongs.
       */
!     public ClassData getClassData() {
!         return classData;
      }
          
--- 81,86 ----
       * @return class to which this allocation data belongs.
       */
!     public ClassData getClazz() {
!         return clazz;
      }
          
***************
*** 159,162 ****
--- 159,165 ----
  /*
   * $Log$
+  * Revision 1.3  2002/02/16 16:21:53  vachis
+  * code refacorization Class.. to Type...  (forgotten methods)
+  *
   * Revision 1.2  2002/02/16 14:05:31  vachis
   * perfomance fix, use EMPY_MAP

[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data MethodData.java,1.11,1.12 AllocTypeData.java,1.1,1.2

From: Pavel V. <va...@us...> - 2002-02-16 14:05:38

Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv19518

Modified Files:
	MethodData.java AllocTypeData.java 
Log Message:
perfomance fix, use EMPY_MAP

Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** MethodData.java	15 Feb 2002 22:37:30 -0000	1.11
--- MethodData.java	16 Feb 2002 14:05:31 -0000	1.12
***************
*** 66,100 ****
       * Mapping of {@link AllocTraceData} objects and trace IDs.
       */
!     private HashMap allocTraces;
      /**
       * Map of threads of this method where some objects were allocated.
       * Mapping of {@link AllocThreadMethodData} objects and thread IDs.
       */
!     private HashMap allocThreads;
      /**
       * Map of classes whose instances were allocated in this method.
       * Mapping of {@link AllocClassMethodData} objects and class IDs.
       */
!     private HashMap classes;
      /**
       * Map of traces of this method.
       * Mapping of {@link CPUTraceData} objects and trace IDs.
       */
!     private HashMap CPUTraces;
      /**
       * Map of threads in which this method was invoked.
       * Mapping of {@link CPUThreadMethodData} objects and thread IDs.
       */
!     private HashMap CPUThreads;
      /**
       * Map of traces in which this method waited.
       * Mapping of {@link CPUTraceData} objects and trace IDs.
       */
!     private HashMap MonTraces;
      /**
       * Map of threads in which this method waited.
       * Mapping of {@link CPUThreadMethodData} objects and thread IDs.
       */
!     private HashMap MonThreads;    
      
      /**
--- 66,100 ----
       * Mapping of {@link AllocTraceData} objects and trace IDs.
       */
!     private Map allocTraces;
      /**
       * Map of threads of this method where some objects were allocated.
       * Mapping of {@link AllocThreadMethodData} objects and thread IDs.
       */
!     private Map allocThreads;
      /**
       * Map of classes whose instances were allocated in this method.
       * Mapping of {@link AllocClassMethodData} objects and class IDs.
       */
!     private Map classes;
      /**
       * Map of traces of this method.
       * Mapping of {@link CPUTraceData} objects and trace IDs.
       */
!     private Map CPUTraces;
      /**
       * Map of threads in which this method was invoked.
       * Mapping of {@link CPUThreadMethodData} objects and thread IDs.
       */
!     private Map CPUThreads;
      /**
       * Map of traces in which this method waited.
       * Mapping of {@link CPUTraceData} objects and trace IDs.
       */
!     private Map MonTraces;
      /**
       * Map of threads in which this method waited.
       * Mapping of {@link CPUThreadMethodData} objects and thread IDs.
       */
!     private Map MonThreads;    
      
      /**
***************
*** 116,126 ****
          this.endLine=endLine;        
          this.clazz=clazz;
!         allocTraces=new HashMap();
!         allocThreads=new HashMap();;
!         CPUTraces=new HashMap();
!         classes=new HashMap();
!         CPUThreads=new HashMap();
!         MonTraces=new HashMap();
!         MonThreads=new HashMap();
      }
      
--- 116,129 ----
          this.endLine=endLine;        
          this.clazz=clazz;
!         
!         //empty collection used, beacause SnapShot includes all methods, most of them
!         //doesn't have any statistic data
!         allocTraces = Collections.EMPTY_MAP; 
!         allocThreads = Collections.EMPTY_MAP;
!         CPUTraces= Collections.EMPTY_MAP; 
!         classes = Collections.EMPTY_MAP;
!         CPUThreads = Collections.EMPTY_MAP;
!         MonTraces = Collections.EMPTY_MAP; 
!         MonThreads = Collections.EMPTY_MAP; 
      }
      
***************
*** 210,213 ****
--- 213,218 ----
       */
      void addAllocTrace(AllocTraceData trace) {
+         if ( allocTraces == Collections.EMPTY_MAP )
+             allocTraces = new HashMap();
          allocTraces.put(new Integer(trace.getID()), trace);
      }
***************
*** 240,243 ****
--- 245,250 ----
       */
      void addCPUTrace(CPUTraceData trace) {
+         if ( CPUTraces == Collections.EMPTY_MAP )
+             CPUTraces = new HashMap();
          CPUTraces.put(new Integer(trace.getID()), trace);
      }
***************
*** 269,272 ****
--- 276,281 ----
       */
      void addMonTrace(MonTraceData trace) {
+         if ( MonTraces == Collections.EMPTY_MAP )
+             MonTraces = new HashMap();
          MonTraces.put(new Integer(trace.getID()), trace);
      }
***************
*** 299,302 ****
--- 308,313 ----
       */
      void addClass(AllocTypeMethodData allocClass) {   
+         if ( classes == Collections.EMPTY_MAP )
+             classes = new HashMap();
          classes.put(new Integer(allocClass.getID()), allocClass);
      }
***************
*** 331,334 ****
--- 342,347 ----
       */
      void addAllocThread(AllocThreadMethodData thread) {
+         if ( allocThreads == Collections.EMPTY_MAP )
+             allocThreads = new HashMap();
          allocThreads.put( thread.getThread(), thread);
      }
***************
*** 361,364 ****
--- 374,379 ----
       */
      void addCPUThread(CPUThreadMethodData thread) {
+         if ( CPUThreads == Collections.EMPTY_MAP )
+             CPUThreads = new HashMap();
          CPUThreads.put(new Integer(thread.getThread().getID()), thread);
      }
***************
*** 390,393 ****
--- 405,410 ----
       */
      void addMonThread(MonThreadMethodData thread) {
+         if ( MonThreads == Collections.EMPTY_MAP )
+             MonThreads = new HashMap();
          MonThreads.put(new Integer(thread.getThread().getID()), thread);
      }
***************
*** 531,534 ****
--- 548,554 ----
  /*
   * $Log$
+  * Revision 1.12  2002/02/16 14:05:31  vachis
+  * perfomance fix, use EMPY_MAP
+  *
   * Revision 1.11  2002/02/15 22:37:30  vachis
   * code refactorization Class..Data renamed to Type..Data

Index: AllocTypeData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTypeData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AllocTypeData.java	15 Feb 2002 22:37:30 -0000	1.1
--- AllocTypeData.java	16 Feb 2002 14:05:31 -0000	1.2
***************
*** 60,65 ****
          this.classData=classData;
          this.arrayType=type;
!         methods=new HashMap();
!         threads=new HashMap();
      }
      
--- 60,65 ----
          this.classData=classData;
          this.arrayType=type;
!         methods=new HashMap(); //??use EMPTY_MAP 
!         threads= Collections.EMPTY_MAP; 
      }
      
***************
*** 138,141 ****
--- 138,143 ----
       */
      void addThread(AllocThreadTypeData thread) {
+         if( threads == Collections.EMPTY_MAP )
+             threads = new HashMap();
          threads.put(new Integer(thread.getThread().getID()), thread);
      }
***************
*** 157,160 ****
--- 159,165 ----
  /*
   * $Log$
+  * Revision 1.2  2002/02/16 14:05:31  vachis
+  * perfomance fix, use EMPY_MAP
+  *
   * Revision 1.1  2002/02/15 22:37:30  vachis
   * code refactorization Class..Data renamed to Type..Data

[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data AllocTraceData.java,1.11,1.12

From: Pavel V. <va...@us...> - 2002-02-16 12:47:49

Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv32739

Modified Files:
	AllocTraceData.java 
Log Message:
fix


Index: AllocTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTraceData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** AllocTraceData.java	15 Feb 2002 22:37:30 -0000	1.11
--- AllocTraceData.java	16 Feb 2002 12:47:45 -0000	1.12
***************
*** 144,148 ****
       */
      void addThread(AllocThreadTraceData thread) {
!         threads.put(thread.getThreadMethod().getThread(), thread);
      }
      
--- 144,148 ----
       */
      void addThread(AllocThreadTraceData thread) {
!         threads.put( new Integer(thread.getThreadMethod().getThread().getID()), thread);
      }
      
***************
*** 163,166 ****
--- 163,169 ----
  /*
   * $Log$
+  * Revision 1.12  2002/02/16 12:47:45  vachis
+  * fix
+  *
   * Revision 1.11  2002/02/15 22:37:30  vachis
   * code refactorization Class..Data renamed to Type..Data

[Javaprofiler-commits] CVS: jpiimpl build.xml,1.7,1.8

From: Pavel V. <va...@us...> - 2002-02-16 10:15:24

Update of /cvsroot/javaprofiler/jpiimpl
In directory usw-pr-cvs1:/tmp/cvs-serv31150

Modified Files:
	build.xml 
Log Message:
new cleanall target

Index: build.xml
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** build.xml	13 Feb 2002 11:35:31 -0000	1.7
--- build.xml	16 Feb 2002 10:15:18 -0000	1.8
***************
*** 149,152 ****
--- 149,156 ----
          </delete>
          <delete file="jpiimpl/jpiimpl.jar"/>
+     </target>
+     
+     
+    <target name="cleanall" depends="init,clean" description="Clean all build products and documnetation.">
          <delete dir="jpiimpl/docs/javadoc"/>
          <delete dir="jpiimpl/docs/html"/>

[Javaprofiler-commits] CVS: test/snapshot readme.txt,1.3,1.4

From: Pavel V. <va...@us...> - 2002-02-15 22:38:45

Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv24897

Modified Files:
	readme.txt 
Log Message:
no message

Index: readme.txt
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/readme.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** readme.txt	13 Feb 2002 11:25:51 -0000	1.3
--- readme.txt	15 Feb 2002 22:38:40 -0000	1.4
***************
*** 2,4 ****
  --------------------------------------
  SET CLASSPATH=..\..\jpiimpl\jpiimpl.jar;.\;%CLASSPATH%
! d:\j2sdk1.4.0-rc\bin\javac *.java 
\ No newline at end of file
--- 2,4 ----
  --------------------------------------
  SET CLASSPATH=..\..\jpiimpl\jpiimpl.jar;.\;%CLASSPATH%
! d:\programs\j2sdk1.4.0\bin\javac *.java 
\ No newline at end of file

[Javaprofiler-commits] CVS: test/snapshot DebugOutput.java,1.2,1.3

From: Pavel V. <va...@us...> - 2002-02-15 22:38:13

Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv24761

Modified Files:
	DebugOutput.java 
Log Message:
code refactorization Class..Data renamed to Type..Data

Index: DebugOutput.java
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/DebugOutput.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DebugOutput.java	12 Feb 2002 11:20:25 -0000	1.2
--- DebugOutput.java	15 Feb 2002 22:38:09 -0000	1.3
***************
*** 76,82 ****
          
          // objectTypes list, AllocClassData object type
!         it = sn.allocObjects().iterator();
          while (it.hasNext()) {
!             AllocClassData o = (AllocClassData) it.next();
              System.out.println("OBJECT TYPE:");
              ClassData c = o.getClassData();
--- 76,82 ----
          
          // objectTypes list, AllocClassData object type
!         it = sn.allocTypes().iterator();
          while (it.hasNext()) {
!             AllocTypeData o = (AllocTypeData) it.next();
              System.out.println("OBJECT TYPE:");
              ClassData c = o.getClassData();
***************
*** 84,88 ****
              System.out.print("IS_ARRAY = ");
              String s;
!             switch (o.getType()) {
                  case IProf.JVMPI_NORMAL_OBJECT:
                      s = "JVMPI_NORMAL_OBJECT";
--- 84,88 ----
              System.out.print("IS_ARRAY = ");
              String s;
!             switch (o.getArrayType()) {
                  case IProf.JVMPI_NORMAL_OBJECT:
                      s = "JVMPI_NORMAL_OBJECT";
***************
*** 195,207 ****
              totalClasses ++;
          }
!         it = sn.allocObjects().iterator();
          while (it.hasNext()) {
!             AllocClassData a = (AllocClassData) it.next();
              Iterator itM = a.getMethods().values().iterator();
              while (itM.hasNext()) {
!                 AllocClassMethodData m = (AllocClassMethodData) itM.next();
                  Iterator itT = m.getTraces().values().iterator();
                  while (itT.hasNext()) {
!                     AllocClassTraceData t = (AllocClassTraceData) itT.next();
                      totalAllocObjectTraces ++;
                  }
--- 195,207 ----
              totalClasses ++;
          }
!         it = sn.allocTypes().iterator();
          while (it.hasNext()) {
!             AllocTypeData a = (AllocTypeData) it.next();
              Iterator itM = a.getMethods().values().iterator();
              while (itM.hasNext()) {
!                 AllocTypeMethodData m = (AllocTypeMethodData) itM.next();
                  Iterator itT = m.getTraces().values().iterator();
                  while (itT.hasNext()) {
!                     AllocTypeTraceData t = (AllocTypeTraceData) itT.next();
                      totalAllocObjectTraces ++;
                  }
***************
*** 215,227 ****
              Iterator itA = th.getClasses().values().iterator();
              while (itA.hasNext()) {
!                 AllocThreadClassData a = (AllocThreadClassData) itA.next();
                  Iterator itM = a.getMethods().values().iterator();
                  while (itM.hasNext()) {
!                     AllocThreadClassMethodData m = (AllocThreadClassMethodData)
                          itM.next();
                      Iterator itT = m.getTraces().values().iterator();
                      while (itT.hasNext()) {
!                         AllocThreadClassTraceData t =
!                             (AllocThreadClassTraceData) itT.next();
                          totalAllocThreadObjectTraces ++;    
                      }
--- 215,227 ----
              Iterator itA = th.getClasses().values().iterator();
              while (itA.hasNext()) {
!                 AllocThreadTypeData a = (AllocThreadTypeData) itA.next();
                  Iterator itM = a.getMethods().values().iterator();
                  while (itM.hasNext()) {
!                     AllocThreadTypeMethodData m = (AllocThreadTypeMethodData)
                          itM.next();
                      Iterator itT = m.getTraces().values().iterator();
                      while (itT.hasNext()) {
!                         AllocThreadTypeTraceData t =
!                             (AllocThreadTypeTraceData) itT.next();
                          totalAllocThreadObjectTraces ++;    
                      }
***************
*** 296,299 ****
--- 296,302 ----
  /*
   * $Log$
+  * Revision 1.3  2002/02/15 22:38:09  vachis
+  * code refactorization Class..Data renamed to Type..Data
+  *
   * Revision 1.2  2002/02/12 11:20:25  petrul
   * fixed output format
***************
*** 305,307 ****
   * First version of DebugOutput
   *
!  */
\ No newline at end of file
--- 308,310 ----
   * First version of DebugOutput
   *
!  */

[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data AllocThreadTypeData.java,NONE,1.1 AllocThreadTypeMethodData.java,NONE,1.1 AllocThreadTypeTraceData.java,NONE,1.1 AllocTypeData.java,NONE,1.1 AllocTypeMethodData.java,NONE,1.1 AllocTypeTraceData.java,NONE,1.1 AllocThreadMethodData.java,1.9,1.10 AllocThreadTraceData.java,1.9,1.10 AllocTraceData.java,1.10,1.11 MethodData.java,1.10,1.11 SnapshotImpl.java,1.9,1.10 ThreadData.java,1.12,1.13

From: Pavel V. <va...@us...> - 2002-02-15 22:37:33

Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv24562

Modified Files:
	AllocThreadMethodData.java AllocThreadTraceData.java 
	AllocTraceData.java MethodData.java SnapshotImpl.java 
	ThreadData.java 
Added Files:
	AllocThreadTypeData.java AllocThreadTypeMethodData.java 
	AllocThreadTypeTraceData.java AllocTypeData.java 
	AllocTypeMethodData.java AllocTypeTraceData.java 
Log Message:
code refactorization Class..Data renamed to Type..Data

--- NEW FILE: AllocThreadTypeData.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.data;

import java.util.*;

import net.sourceforge.javaprofiler.jpiimpl.commun.*;
/**
 * Allocation data for one thread and class.
 *
 * @author Jan Stola
 */
public class AllocThreadTypeData extends AllocAbstractStatThreadClassData {
    /** Allocation data for this thread. */
    private ThreadData thread;
    /** Allocation data for this class. */
    private AllocTypeData type;
    /**
     * Map of methods where an instance of this class was allocated (in given thread).
     * Mapping of {@link AllocThreadClassMethodData} objects and method IDs.
     */
    private Map methods;
    
    /**
     * Creates new AllocThreadClassData.
     *
     * @param ID unique ID of this object.
     * @param thread allocation data for this thread.
     * @param clazz allocation data for this class.
     */
    AllocThreadTypeData(int ID, ThreadData thread, AllocTypeData clazz) {
        super(ID);
        this.thread=thread;
        this.type=clazz;
        methods=new HashMap();
    }
    
      /**
     * Creates new AllocThreadClassdData.
     *
     * @param sid data returned by communication layer 
     * @param thread allocation data for this thread.       
     * @param clazz allocation data for this class.
     */
    AllocThreadTypeData( IProf.sID sid, ThreadData thread, AllocTypeData clazz ) {
        this( sid.objId, thread, clazz );
        
        //if (sid.alloc!=null) //do not test this, its an error
        setStatistics(sid.alloc);
    }
   
    
    /**
     * Returns allocation data for this thread.
     *
     * @return allocation data for this thread.
     */
    public ThreadData getThread() {
        return thread;
    }
    
    /**
     * Return allocation data for this class.
     *
     * @return allocation data for this class.
     */
    public AllocTypeData getType() {
        return type;
    }
    
    /**
     * Returns map of methods where an instance of this class was allocated
     * (in given thread).
     *
     * @return mapping of {@link AllocThreadClassMethodData} objects nad method IDs.
     */
    public Map getMethods() {
        return methods;
    }
    
    /**
     * Adds method where an instance of this class was allocated
     * (in given thread).
     *
     * @param method method where an instance of this class was allocated
     * (in given thread).
     */
    void addMethod(AllocThreadTypeMethodData method) {
        methods.put(new Integer(method.getTypeMethod().getMethod().getID()), method);
    }
    
    /**
     * Returns method (with given ID) where an instances of this class were
     * allocated (in given thread).
     *         
     * @param ID ID of the method.
     * @return method (with given ID) where an instances of this class were
     * allocated (in given thread) or <code>null</code> if such thread does
     * not exist.
     */    
    public AllocThreadTypeMethodData getMethod(int ID) {
        return (AllocThreadTypeMethodData)methods.get(new Integer(ID));
    }

}

/*
 * $Log: AllocThreadTypeData.java,v $
 * Revision 1.1  2002/02/15 22:37:30  vachis
 * code refactorization Class..Data renamed to Type..Data
 *
 * Revision 1.7  2002/01/11 22:22:16  vachis
 * unnecessary test removed
 *
 * Revision 1.6  2001/12/01 20:03:27  petrul
 * changed constructor code
 *
 * Revision 1.5  2001/11/20 22:23:37  vachis
 * Contructors from IProf.sID and  monitors statistic info
 *
 * Revision 1.4  2001/09/29 21:01:33  stolis
 * Plural added in licenses.
 *
 * Revision 1.3  2001/07/19 21:59:22  stolis
 * Keys of maps changed.
 *
 * Revision 1.2  2001/07/18 22:20:39  stolis
 * Mirrors for CPU profiling added;
 * references to obejct IDs removed;
 * Lists changed to Maps.
 *
 * Revision 1.1.1.1  2001/07/11 22:27:40  stolis
 * no message
 *
 */

--- NEW FILE: AllocThreadTypeMethodData.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.data;

import java.util.*;

import net.sourceforge.javaprofiler.jpiimpl.commun.*;

/**
 * Allocation data for one class, method and thread.
 *
 * @author Jan Stola
 */
public class AllocThreadTypeMethodData extends AllocAbstractStatThreadClassData {
    /** Allocation data for this class and thread. */
    private AllocThreadTypeData threadType;
    /** Allocation data for this class and method. */
    private AllocTypeMethodData typeMethod;
    /** Allocation data for this method and thread. */
    private AllocThreadMethodData threadMethod;
    /**
     * MAp of traces of this method in this thread where instances of this class
     * were allocated. Mapping of {@link AllocThreadClassMethodTraceData} objects
     * and trace IDs.
     */
    private Map traces;
    
    /**
     * Creates new AllocThreadClassMethodData.
     *
     * @param ID unique ID of this object.
     * @param threadClass allocation data for this class and thread.
     * @param classMethod allocation data for this class and method.
     * @param threadMethod allocation data for this thread and method.
     */
    AllocThreadTypeMethodData(int ID, AllocThreadTypeData threadClass,
    AllocTypeMethodData classMethod, AllocThreadMethodData threadMethod) {
        super(ID);
        this.threadType=threadClass;
        this.typeMethod=classMethod;
        this.threadMethod=threadMethod;
        traces=new HashMap();
    }
    
   
      /**
     * Creates new AllocThreadClassMethodData.
     *
     * @param sid data returned by communication layer 
     * @param threadClass allocation data for this class and thread.
     * @param classMethod allocation data for this class and method.
     * @param threadMethod allocation data for this thread and method.
     */
    AllocThreadTypeMethodData( IProf.sID sid, AllocThreadTypeData threadClass,
    AllocTypeMethodData classMethod, AllocThreadMethodData threadMethod ) {
        this( sid.objId, threadClass, classMethod, threadMethod );
        
        //if (sid.alloc!=null) //do not test this, its an error
        setStatistics(sid.alloc);
    }   

    /**
     * Returns allocation data for this class and thread.
     *
     * @return allocation data for this class and thread.
     */
    public AllocThreadTypeData getThreadType() {
        return threadType;
    }
    
    /**
     * Returns allocation data for this class and method.
     *
     * @return allocation data for this class and method.
     */
    public AllocTypeMethodData getTypeMethod() {
        return typeMethod;
    }
    
    /**
     * Returns allocation data for this thread and method.
     *
     * @return allocation data for this thread and method.
     */
    public AllocThreadMethodData getThreadMethod() {
        return threadMethod;
    }
    
    /**
     * Returns map of traces of this method in this thread where instances of this
     * class were allocated.
     *
     * @return mapping of {@link AllocThreadClassTraceData} objects and trace IDs.
     */
    public Map getTraces() {
        return traces;
    }
    
    /**
     * Adds trace of this method in this thread where instances of this
     * class were allocated.
     *
     * @param trace trace of this method in this thread where instances of this
     * class were allocated.
     */
    void addTrace(AllocThreadTypeTraceData trace) {
        traces.put(new Integer(trace.getTypeTrace().getTrace().getID()), trace);
    }
    
    /**
     * Returns trace (with given ID) of this method in this thread where
     * instances of this class were allocated.
     *         
     * @param ID ID of the trace.
     * @return trace (with given ID) of this method in this thread where
     * instances of this class were allocated or <code>null</code> if such
     * trace does not exist.
     */     
    public AllocThreadTypeTraceData getTrace(int ID) {
        return (AllocThreadTypeTraceData)traces.get(new Integer(ID));
    }
    
}

/*
 * $Log: AllocThreadTypeMethodData.java,v $
 * Revision 1.1  2002/02/15 22:37:30  vachis
 * code refactorization Class..Data renamed to Type..Data
 *
 * Revision 1.7  2002/01/11 22:22:16  vachis
 * unnecessary test removed
 *
 * Revision 1.6  2001/12/01 20:06:49  petrul
 * changed constructor code
 *
 * Revision 1.5  2001/11/20 22:23:37  vachis
 * Contructors from IProf.sID and  monitors statistic info
 *
 * Revision 1.4  2001/09/29 21:01:33  stolis
 * Plural added in licenses.
 *
 * Revision 1.3  2001/07/19 21:59:22  stolis
 * Keys of maps changed.
 *
 * Revision 1.2  2001/07/18 22:20:39  stolis
 * Mirrors for CPU profiling added;
 * references to obejct IDs removed;
 * Lists changed to Maps.
 *
 * Revision 1.1.1.1  2001/07/11 22:27:42  stolis
 * no message
 *
 */

--- NEW FILE: AllocThreadTypeTraceData.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.data;

import net.sourceforge.javaprofiler.jpiimpl.commun.*;
/**
 * Allocation data for one class, thread and trace.
 *
 * @author Jan Stola
 */
public class AllocThreadTypeTraceData extends AllocAbstractStatThreadClassData {
    /** Allocation data for this class and trace. */
    private AllocTypeTraceData typeTrace;
    /** Allocation data for this class, thread and method. */
    private AllocThreadTypeMethodData threadTypeMethod;
    /** Allocation data for this thread and trace. */
    private AllocThreadTraceData threadTrace;
    
    /**
     * Creates new AllocThreadClassTraceData.
     *
     * @param ID unique ID of this object.
     * @param classTrace allocation data for this class and trace.
     * @param threadClassMethod allocation data for this class, thread and method.
     * @param threadTrace allocation data for this thread and trace.
     */
    AllocThreadTypeTraceData(int ID, AllocTypeTraceData classTrace,
        AllocThreadTypeMethodData threadClassMethod,
        AllocThreadTraceData threadTrace) {
        super(ID);
        this.typeTrace=classTrace;
        this.threadTypeMethod=threadClassMethod;
        this.threadTrace=threadTrace;
    }
    
        /**
     * Creates new AllocThreadClassTraceData.
     *
     * @param sid data returned by communication layer 
     * @param classTrace allocation data for this class and trace.
     * @param threadClassMethod allocation data for this class, thread and method.
     * @param threadTrace allocation data for this thread and trace.
     */
    AllocThreadTypeTraceData( IProf.sID sid, AllocTypeTraceData classTrace,
        AllocThreadTypeMethodData threadClassMethod,
        AllocThreadTraceData threadTrace ) {
        this( sid.objId, classTrace, threadClassMethod, threadTrace );
        
        //if (sid.alloc!=null) //do not test this, its an error
        setStatistics(sid.alloc);
    }   
    
    /**
     * Returns allocation data for this class and trace.
     *
     * @return allocation data for this class and trace.
     */
    public AllocTypeTraceData getTypeTrace() {
        return typeTrace;
    }
    
    /**
     * Returns allocation data for this class, thread and method.
     *
     * @return allocation data for this class, thread and method.
     */
    public AllocThreadTypeMethodData getThreadTypeMethod() {
        return threadTypeMethod;
    }
    
    /**
     * Returns allocation data for this thread and trace.
     *
     * @return allocation data for this thread and trace.
     */
    public AllocThreadTraceData getThreadTrace() {
        return threadTrace;
    }

}

/*
 * $Log: AllocThreadTypeTraceData.java,v $
 * Revision 1.1  2002/02/15 22:37:30  vachis
 * code refactorization Class..Data renamed to Type..Data
 *
 * Revision 1.5  2002/01/11 22:22:16  vachis
 * unnecessary test removed
 *
 * Revision 1.4  2001/12/01 20:11:38  petrul
 * changed constructor code
 *
 * Revision 1.3  2001/11/20 22:23:37  vachis
 * Contructors from IProf.sID and  monitors statistic info
 *
 * Revision 1.2  2001/09/29 21:01:33  stolis
 * Plural added in licenses.
 *
 * Revision 1.1.1.1  2001/07/11 22:27:48  stolis
 * no message
 *
 */

--- NEW FILE: AllocTypeData.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.data;

import java.util.*;

import net.sourceforge.javaprofiler.jpiimpl.commun.*;
/**
 * Allocation data for one class.
 *
 * @author Jan Stola
 */
public class AllocTypeData extends AllocAbstractStatThreadClassData {
    /** Class to which this allocation data belongs. */
    private ClassData classData;
    /**
     * Type of the class (for example JVMPI_NORMAL_OBJECT, JVMPI_CLASS,
     * JVMPI_BOOLEAN etc.)
     */
    private int arrayType; //PENDING
    /**
     * Map of methods where instance of this class were allocated.
     * Mapping between {@link AllocClassMethodData} objects and method IDs.
     */
    private Map methods;
    /**
     * Map of threads in which instances of this class were allocated.
     * Mapping between {@link AllocThreadClassData} objects and thread IDs.
     */
    private Map threads;

    /**
     * Creates new AllocClassData.
     *
     * @param ID unique ID of this object.
     * @param classData class to which this allocation data belongs.
     * @param classID object ID of the Class object of this class.
     * @param type type of this class.
     */
    AllocTypeData(int ID, ClassData classData, int type) {
        super(ID);
        this.classData=classData;
        this.arrayType=type;
        methods=new HashMap();
        threads=new HashMap();
    }
    
    /**
     * Creates new AllocClassData.
     * @param sid data returned by communication layer 
     * @param clazz class to which this allocation data belongs.
     */
    AllocTypeData(IProf.sID sid, ClassData clazz) {
        this( sid.objId, clazz, ((IProf.sObjectInfo) sid.info).isArray ); 
        
        //if (sid.alloc != null) //do not test this, its an error
        setStatistics(sid.alloc); 
    }
    
    /**
     * Returns class to which this allocation data belongs.
     *
     * @return class to which this allocation data belongs.
     */
    public ClassData getClassData() {
        return classData;
    }
        
    /**
     * Returns type of the class.
     *
     * @return type of the class.
     */
    public int getArrayType() {
        return arrayType;
    }
    
    /**
     * Returns map of methods where instance of this class were allocated.
     *
     * @return mapping between {@link AllocClassMethodData} objects and method IDs.
     */
    public Map getMethods() {
        return methods;
    }
    
    /**
     * Adds method where instance of this class was allocated.
     *
     * @param method method where instance of this class were allocated.
     */
    void addMethod(AllocTypeMethodData method) {
        methods.put(new Integer(method.getMethod().getID()), method);
    }
    
    /**
     * Returns method (with given ID) where instance of this class was allocated.    
     *     
     * @param ID ID of the method.
     * @return method (with given ID) where instance of this class was allocated
     * or <code>null</code> if such method does not exist.
     */
    public AllocTypeMethodData getMethod(int ID) {
        return (AllocTypeMethodData)methods.get(new Integer(ID));
    }
    
    /**
     * Return map of threads in which instances of this class were allocated.
     *
     * @return mapping between {@link AllocThreadClassData} objects and thread IDs.
     */
    public Map getThreads() {
        return threads;
    }
    
    /**
     * Adds thread where instances of this class were allocated.
     *
     * @param thread where instances of this class were allocated.
     */
    void addThread(AllocThreadTypeData thread) {
        threads.put(new Integer(thread.getThread().getID()), thread);
    }
    
    /**
     * Returns thread (with given ID) where instances of this class
     * were allocated.
     *         
     * @param ID ID of the thread.
     * @return thread (with given ID) where instances of this class
     * were allocated or <code>null</code> if such thread does not exist.
     */
    public AllocThreadTypeData getThread(int ID) {
        return (AllocThreadTypeData)methods.get(new Integer(ID));
    }    

}

/*
 * $Log: AllocTypeData.java,v $
 * Revision 1.1  2002/02/15 22:37:30  vachis
 * code refactorization Class..Data renamed to Type..Data
 *
 * Revision 1.8  2002/01/11 22:22:16  vachis
 * unnecessary test removed
 *
 * Revision 1.7  2001/12/06 20:27:22  vachis
 * use isArray atribute
 *
 * Revision 1.6  2001/12/01 17:42:54  petrul
 * changed constructor code
 *
 * Revision 1.5  2001/11/20 22:23:37  vachis
 * Contructors from IProf.sID and  monitors statistic info
 *
 * Revision 1.4  2001/09/29 21:01:33  stolis
 * Plural added in licenses.
 *
 * Revision 1.3  2001/07/19 21:59:22  stolis
 * Keys of maps changed.
 *
 * Revision 1.2  2001/07/18 22:20:39  stolis
 * Mirrors for CPU profiling added;
 * references to obejct IDs removed;
 * Lists changed to Maps.
 *
 * Revision 1.1.1.1  2001/07/11 22:27:31  stolis
 * no message
 *
 */

--- NEW FILE: AllocTypeMethodData.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.data;

import java.util.*;

import net.sourceforge.javaprofiler.jpiimpl.commun.*;

/**
 * Allocation data for one class and method.
 *
 * @author Jan Stola
 */
public class AllocTypeMethodData extends AllocAbstractStatThreadClassData {
    /** Allocation data for this class. */
    private AllocTypeData clazz;
    /** Allocation data for this method. */
    private MethodData method;
    /**
     * Map of traces of the method in which instances of this class were
     * allocated. Mapping between {@link AllocClassTraceData} objects and
     * trace IDs.
     */
    private Map traces;
    /**
     * Map of threads where the method was called and instances of this class
     * allocated. Mapping between {@link AllocThreadClassMethodData} objects
     * and thread IDs.
     */
    private Map threads;
    
    /**
     * Creates new AllocClassMethodData.
     *
     * @param ID unique ID of this object.
     * @param clazz allocation data for this class.
     * @param method allocation data for this method.
     */
    AllocTypeMethodData(int ID, AllocTypeData clazz, MethodData method) {
        super(ID);
        this.clazz=clazz;
        this.method=method;
        traces=new HashMap();
        threads=new HashMap();
    }
    
    /**
     * Creates new AllocClassMethodData.
     *
     * @param sid data returned by communication layer 
     * @param method allocation data for this method.     
     * @param clazz allocation data for this class.
     */
    AllocTypeMethodData( IProf.sID sid, AllocTypeData clazz, MethodData method ) {
        this( sid.objId, clazz, method );
        
        //if (sid.alloc!=null) //do not test this, its an error
        setStatistics(sid.alloc);
    }

    /**
     * Returns allocation data for this class.
     *
     * @return allocation data for this class.
     */
    public AllocTypeData getClazz() {
        return clazz;
    }
    
    /**
     * Returns allocation data for this method.
     *
     * @return allocation data for this method.
     */
    public MethodData getMethod() {
        return method;
    }
    
    /**
     * Returns map of traces of the method in which instances of this class were
     * allocated.
     *
     * @return mapping between {@link AllocClassTraceData} objects and trace IDs.
     */
    public Map getTraces() {
        return traces;
    }
    
    /**
     * Adds trace of the method in which instances of this class were allocated.
     *
     * @param trace trace of the method in which instances of this class were
     * allocated.
     */
    void addTrace(AllocTypeTraceData trace) {
        traces.put(new Integer(trace.getTrace().getID()), trace);
    }
    
    /**
     * Returns trace (with given ID) of the method in which instances of this
     * class were allocated.
     *         
     * @param ID ID of the trace.
     * @return trace (with given ID) of the method in which instances of this
     * class were allocated or <code>null</code> if such trace does not exist.
     */
    public AllocTypeTraceData getTrace(int ID) {
        return (AllocTypeTraceData)traces.get(new Integer(ID));
    }
    
    /**
     * Returns map of threads where the method was called and instances of this
     * class allocated.
     *
     * @return mapping of {@link AllocThreadClassMethodData} objects and thread IDs.
     */
    public Map getThreads() {
        return threads;
    }
    
    /**
     * Adds thread where the method was called and instances of this class
     * allocated.
     *
     * @param thread thread where the method was called and instances of this
     * class allocated.
     */
    void addThread(AllocThreadTypeMethodData thread) {
        threads.put(new Integer(thread.getThreadType().getThread().getID()), thread);
    }
    
    /**
     * Returns thread (with given ID) where the method was called and instances
     * of this class allocated.
     *         
     * @param ID ID of the thread.
     * @return thread (with given ID) where the method was called and instances
     * of this class allocated or <code>null</code> if such thread does not exist.
     */
    public AllocThreadTypeMethodData getThread(int ID) {
        return (AllocThreadTypeMethodData)threads.get(new Integer(ID));
    }
    
}

/*
 * $Log: AllocTypeMethodData.java,v $
 * Revision 1.1  2002/02/15 22:37:30  vachis
 * code refactorization Class..Data renamed to Type..Data
 *
 * Revision 1.7  2002/01/11 22:22:16  vachis
 * unnecessary test removed
 *
 * Revision 1.6  2001/12/01 19:51:44  petrul
 * changed constructor code
 *
 * Revision 1.5  2001/11/20 22:23:37  vachis
 * Contructors from IProf.sID and  monitors statistic info
 *
 * Revision 1.4  2001/09/29 21:01:33  stolis
 * Plural added in licenses.
 *
 * Revision 1.3  2001/07/19 21:59:22  stolis
 * Keys of maps changed.
 *
 * Revision 1.2  2001/07/18 22:20:39  stolis
 * Mirrors for CPU profiling added;
 * references to obejct IDs removed;
 * Lists changed to Maps.
 *
 * Revision 1.1.1.1  2001/07/11 22:27:31  stolis
 * no message
 *
 */

--- NEW FILE: AllocTypeTraceData.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.data;

import java.util.*;

import net.sourceforge.javaprofiler.jpiimpl.commun.*;

/**
 * Allocation data for one class and trace.
 *
 * @author Jan Stola
 */
public class AllocTypeTraceData extends AllocAbstractStatThreadClassData {
    /** Allocation data for this class and method. */
    private AllocTypeMethodData classMethod; 
    /** Allocation data for this trace. */
    private AllocTraceData trace;
    /**
     * Map of threads where instances of this class were allocated in given trace.
     * Mapping of {@link AllocThreadClassTraceData} objects and thread IDs.
     */
    private Map threads;
    
    /**
     * Creates new AllocClassTraceData.
     *
     * @param ID unique ID of this object.
     * @param classMethod allocation data for this class and method.
     * @param trace allocation data for this trace.
     */
    AllocTypeTraceData(int ID, AllocTypeMethodData classMethod,
    AllocTraceData trace) {
        super(ID);
        this.classMethod=classMethod;
        this.trace=trace;
        threads=new HashMap();
    }
    
    /**
     * Creates new AllocClassTraceData.
     * @param sid data returned by communication layer 
     * @param trace allocation data for this trace.          
     * @param classMethod allocation data for this class and method.
     */
    AllocTypeTraceData( IProf.sID sid, AllocTypeMethodData classMethod,
                        AllocTraceData trace) {
        this( sid.objId, classMethod, trace );
        
        //if (sid.alloc!=null) //do not test this, its an error
        setStatistics(sid.alloc);
    }
    
    /**
     * Returns allocation data for this class and method.
     *
     * @return allocation data for this class and method.
     */
    public AllocTypeMethodData getClassMethod() {
        return classMethod;
    }
    
    /**
     * Returns allocation data for this trace.
     *
     * @return allocation data for this trace.
     */
    public AllocTraceData getTrace() {
        return trace;
    }
    
    /**
     * Returns map of threads where instances of this class were allocated
     * in given trace.
     *
     * @return mapping of {@link AllocThreadClassTraceData} objects and thread IDs.
     */
    public Map getThreads() {
        return threads;
    }
    
    /**
     * Adds thread where instances of this class were allocated in given trace.
     *
     * @param thread thread where instances of this class were allocated
     * in given trace.
     */
    void addThread(AllocThreadTypeTraceData thread) {
        threads.put(new Integer(thread.getThreadTrace().getThreadMethod().getThread().getID()), thread);
    }
    
    /**
     * Returns thread (with given ID) where instances of this class were
     * allocated in given trace.
     *         
     * @param ID ID of the thread.
     * @return thread (with given ID) where instances of this class were
     * allocated in given trace or <code>null</code> if such thread does
     * not exist.
     */    
    public AllocThreadTypeTraceData getThread(int ID) {
        return (AllocThreadTypeTraceData)threads.get(new Integer(ID));
    }

}

/*
 * $Log: AllocTypeTraceData.java,v $
 * Revision 1.1  2002/02/15 22:37:30  vachis
 * code refactorization Class..Data renamed to Type..Data
 *
 * Revision 1.7  2002/01/11 22:22:16  vachis
 * unnecessary test removed
 *
 * Revision 1.6  2001/12/01 19:56:03  petrul
 * changed constructor code
 *
 * Revision 1.5  2001/11/20 22:23:37  vachis
 * Contructors from IProf.sID and  monitors statistic info
 *
 * Revision 1.4  2001/09/29 21:01:33  stolis
 * Plural added in licenses.
 *
 * Revision 1.3  2001/07/19 21:59:22  stolis
 * Keys of maps changed.
 *
 * Revision 1.2  2001/07/18 22:20:39  stolis
 * Mirrors for CPU profiling added;
 * references to obejct IDs removed;
 * Lists changed to Maps.
 *
 * Revision 1.1.1.1  2001/07/11 22:27:37  stolis
 * no message
 *
 */

Index: AllocThreadMethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadMethodData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocThreadMethodData.java	15 Jan 2002 22:05:57 -0000	1.9
--- AllocThreadMethodData.java	15 Feb 2002 22:37:30 -0000	1.10
***************
*** 39,43 ****
       * Mapping of {@link AllocThreadClassMethodData} objects and class IDs.
       */
!     private Map classes;
      /**
       * Map of traces of this method in this thread.
--- 39,43 ----
       * Mapping of {@link AllocThreadClassMethodData} objects and class IDs.
       */
!     private Map types;
      /**
       * Map of traces of this method in this thread.
***************
*** 57,61 ****
          this.thread=thread;
          this.method=method;
!         classes=new HashMap();
          traces=new HashMap();
      }
--- 57,61 ----
          this.thread=thread;
          this.method=method;
!         types=new HashMap();
          traces=new HashMap();
      }
***************
*** 99,104 ****
       * @return mapping of {@link AllocThreadClassMethodData} objects and class IDs.
       */
!     public Map getClasses() {
!         return classes;
      }
      
--- 99,104 ----
       * @return mapping of {@link AllocThreadClassMethodData} objects and class IDs.
       */
!     public Map getTypes() {
!         return types;
      }
      
***************
*** 109,115 ****
       * @param allocClass allocClass that were allocated in this method and thread.
       */
!     void addClass(AllocThreadClassMethodData allocClass) {
  //FIXME 
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
--- 109,115 ----
       * @param allocClass allocClass that were allocated in this method and thread.
       */
!     void addType(AllocThreadTypeMethodData allocClass) {
  //FIXME 
!         types.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 123,128 ****
       * not exist.
       */
!     public AllocThreadClassMethodData getClass(int ID) {
!         return (AllocThreadClassMethodData)classes.get(new Integer(ID));
      }
      
--- 123,128 ----
       * not exist.
       */
!     public AllocThreadTypeMethodData getType(int ID) {
!         return (AllocThreadTypeMethodData)types.get(new Integer(ID));
      }
      
***************
*** 160,163 ****
--- 160,166 ----
  /*
   * $Log$
+  * Revision 1.10  2002/02/15 22:37:30  vachis
+  * code refactorization Class..Data renamed to Type..Data
+  *
   * Revision 1.9  2002/01/15 22:05:57  vachis
   * addClass() modified
***************
*** 190,192 ****
   * no message
   *
!  */
\ No newline at end of file
--- 193,195 ----
   * no message
   *
!  */

Index: AllocThreadTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocThreadTraceData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** AllocThreadTraceData.java	15 Jan 2002 22:05:57 -0000	1.9
--- AllocThreadTraceData.java	15 Feb 2002 22:37:30 -0000	1.10
***************
*** 39,43 ****
       * Mapping of {@link AllocThreadClassTraceData} objects and class IDs.
       */
!     private Map classes; 
      
      /**
--- 39,43 ----
       * Mapping of {@link AllocThreadClassTraceData} objects and class IDs.
       */
!     private Map types; 
      
      /**
***************
*** 52,56 ****
          this.threadMethod=threadMethod;
          this.trace=trace;
!         classes=new HashMap();
      }
      
--- 52,56 ----
          this.threadMethod=threadMethod;
          this.trace=trace;
!         types=new HashMap();
      }
      
***************
*** 93,98 ****
       * @return mapping of {@link AllocThreadClassTraceData} objects and class IDs.
       */
!     public Map getClasses() {
!         return classes;
      }
  
--- 93,98 ----
       * @return mapping of {@link AllocThreadClassTraceData} objects and class IDs.
       */
!     public Map getTypes() {
!         return types;
      }
  
***************
*** 104,110 ****
       * and thread.
       */
!     void addClass(AllocThreadClassTraceData allocClass) {
  //       FIXME:
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
--- 104,110 ----
       * and thread.
       */
!     void addType(AllocThreadTypeTraceData allocClass) {
  //       FIXME:
!         types.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 118,123 ****
       * not exist.
       */
!     public AllocThreadClassTraceData getClass(int ID) {
!         return (AllocThreadClassTraceData)classes.get(new Integer(ID));
      }
  
--- 118,123 ----
       * not exist.
       */
!     public AllocThreadTypeTraceData getType(int ID) {
!         return (AllocThreadTypeTraceData)types.get(new Integer(ID));
      }
  
***************
*** 126,129 ****
--- 126,132 ----
  /*
   * $Log$
+  * Revision 1.10  2002/02/15 22:37:30  vachis
+  * code refactorization Class..Data renamed to Type..Data
+  *
   * Revision 1.9  2002/01/15 22:05:57  vachis
   * addClass() modified
***************
*** 156,158 ****
   * no message
   *
!  */
\ No newline at end of file
--- 159,161 ----
   * no message
   *
!  */

Index: AllocTraceData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/AllocTraceData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AllocTraceData.java	15 Jan 2002 22:05:56 -0000	1.10
--- AllocTraceData.java	15 Feb 2002 22:37:30 -0000	1.11
***************
*** 42,46 ****
       * Mapping of {@link AllocClassTraceData} objects and class IDs.
       */
!     private Map classes; 
      /**
       * Map of threads in which this trace appeared.
--- 42,46 ----
       * Mapping of {@link AllocClassTraceData} objects and class IDs.
       */
!     private Map types; 
      /**
       * Map of threads in which this trace appeared.
***************
*** 61,65 ****
          this.method=method;
          this.frames=frames;
!         classes=new HashMap();
          threads=new HashMap();
      }
--- 61,65 ----
          this.method=method;
          this.frames=frames;
!         types=new HashMap();
          threads=new HashMap();
      }
***************
*** 102,107 ****
       * @return mapping of {@link AllocClassTraceData} objects and class IDs.
       */
!     public Map getClasses() {
!         return classes;
      }
      
--- 102,107 ----
       * @return mapping of {@link AllocClassTraceData} objects and class IDs.
       */
!     public Map getTypes() {
!         return types;
      }
      
***************
*** 112,118 ****
       * @param allocClass allocClass that were allocated in this trace.
       */
!     void addClass(AllocClassTraceData allocClass) {
  //FIXMEE:
!         classes.put(new Integer(allocClass.getID()), allocClass);
      }
      
--- 112,118 ----
       * @param allocClass allocClass that were allocated in this trace.
       */
!     void addType(AllocTypeTraceData allocClass) {
  //FIXMEE:
!         types.put(new Integer(allocClass.getID()), allocClass);
      }
      
***************
*** 125,130 ****
       * in this trace or <code>null</code> if such class does not exist.
       */
!     public AllocClassTraceData getClass(int ID) {
!         return (AllocClassTraceData)classes.get(new Integer(ID));
      }
      
--- 125,130 ----
       * in this trace or <code>null</code> if such class does not exist.
       */
!     public AllocTypeTraceData getType(int ID) {
!         return (AllocTypeTraceData)types.get(new Integer(ID));
      }
      
***************
*** 163,166 ****
--- 163,169 ----
  /*
   * $Log$
+  * Revision 1.11  2002/02/15 22:37:30  vachis
+  * code refactorization Class..Data renamed to Type..Data
+  *
   * Revision 1.10  2002/01/15 22:05:56  vachis
   * addClass() modified
***************
*** 196,198 ****
   * no message
   *
!  */
\ No newline at end of file
--- 199,201 ----
   * no message
   *
!  */

Index: MethodData.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/MethodData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** MethodData.java	15 Jan 2002 22:05:56 -0000	1.10
--- MethodData.java	15 Feb 2002 22:37:30 -0000	1.11
***************
*** 298,302 ****
       * @param allocClass allocClass that were allocated in this method.
       */
!     void addClass(AllocClassMethodData allocClass) {   
          classes.put(new Integer(allocClass.getID()), allocClass);
      }
--- 298,302 ----
       * @param allocClass allocClass that were allocated in this method.
       */
!     void addClass(AllocTypeMethodData allocClass) {   
          classes.put(new Integer(allocClass.getID()), allocClass);
      }
***************
*** 310,315 ****
       * in this method or <code>null</code> if such class does not exist.
       */
!     public AllocClassMethodData getClass(int ID) {
!         return (AllocClassMethodData)classes.get(new Integer(ID));
      }
      
--- 310,315 ----
       * in this method or <code>null</code> if such class does not exist.
       */
!     public AllocTypeMethodData getClass(int ID) {
!         return (AllocTypeMethodData)classes.get(new Integer(ID));
      }
      
***************
*** 531,534 ****
--- 531,537 ----
  /*
   * $Log$
+  * Revision 1.11  2002/02/15 22:37:30  vachis
+  * code refactorization Class..Data renamed to Type..Data
+  *
   * Revision 1.10  2002/01/15 22:05:56  vachis
   * addClass() modified
***************
*** 565,567 ****
   * no message
   *
!  */
\ No newline at end of file
--- 568,570 ----
   * no message
   *
!  */

Index: SnapshotImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data/SnapshotImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** SnapshotImpl.java	26 Jan 2002 20:56:02 -0000	1.9
--- SnapshotImpl.java	15 Feb 2002 22:37:30 -0000	1.10
***************
*** 46,50 ****
      private LinkedList groupThreads = new LinkedList();
      private LinkedList threads = new LinkedList();
!     private LinkedList allocObjects = new LinkedList();
      private LinkedList arenas = new LinkedList();
      private LinkedList gcs = new LinkedList();
--- 46,50 ----
      private LinkedList groupThreads = new LinkedList();
      private LinkedList threads = new LinkedList();
!     private LinkedList allocTypes = new LinkedList();
      private LinkedList arenas = new LinkedList();
      private LinkedList gcs = new LinkedList();
***************
*** 267,272 ****
       * @return list of allocatable objects.
       */
!     public List allocObjects() {
!         return allocObjects;
      }
      
--- 267,272 ----
       * @return list of allocatable objects.
       */
!     public List allocTypes() {
!         return allocTypes;
      }
      
***************
*** 375,381 ****
                  actLst2.clear();
                  actLst.clear();
!                 extract( null, allocObjects, IProf.OBJECT_TYPES, 
                          IProf.NO_OPTIONAL_ARG, iprof );
!                 extract( allocObjects, (withTraces)? actLst : null,
                          IProf.ALLOC_OBJECT_METHODS, 
                          IProf.NO_OPTIONAL_ARG, iprof );
--- 375,381 ----
                  actLst2.clear();
                  actLst.clear();
!                 extract( null, allocTypes, IProf.OBJECT_TYPES, 
                          IProf.NO_OPTIONAL_ARG, iprof );
!                 extract( allocTypes, (withTraces)? actLst : null,
                          IProf.ALLOC_OBJECT_METHODS, 
                          IProf.NO_OPTIONAL_ARG, iprof );
***************
*** 636,640 ****
                                      ((IProf.sObjectInfo) sid.info).classObjId));
                  //ClassData clz = null;
!                 return new AllocClassData( sid, clz ); 
                  //have to look at sid.info.isArray, probably in object
                  //before calling getClazz()
--- 636,640 ----
                                      ((IProf.sObjectInfo) sid.info).classObjId));
                  //ClassData clz = null;
!                 return new AllocTypeData( sid, clz ); 
                  //have to look at sid.info.isArray, probably in object
                  //before calling getClazz()
***************
*** 725,731 ****
              case IProf.ALLOC_METHOD_OBJECTS: {
                  MethodData lf = (MethodData) refObj;
!                 AllocClassData up = (AllocClassData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
!                 AllocClassMethodData newObj = new AllocClassMethodData( sid, up, lf ); 
                  lf.addClass( newObj );
                  up.addMethod( newObj );
--- 725,731 ----
              case IProf.ALLOC_METHOD_OBJECTS: {
                  MethodData lf = (MethodData) refObj;
!                 AllocTypeData up = (AllocTypeData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
!                 AllocTypeMethodData newObj = new AllocTypeMethodData( sid, up, lf ); 
                  lf.addClass( newObj );
                  up.addMethod( newObj );
***************
*** 735,740 ****
                  MethodData lf = (MethodData) 
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocClassData up = (AllocClassData) refObj;
!                 AllocClassMethodData newObj = new AllocClassMethodData( sid, up, lf );
                  lf.addClass( newObj );
                  up.addMethod( newObj );
--- 735,740 ----
                  MethodData lf = (MethodData) 
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocTypeData up = (AllocTypeData) refObj;
!                 AllocTypeMethodData newObj = new AllocTypeMethodData( sid, up, lf );
                  lf.addClass( newObj );
                  up.addMethod( newObj );
***************
*** 743,760 ****
              ////
              case IProf.ALLOC_TRACE_OBJECTS:  {
!                 AllocClassMethodData up = (AllocClassMethodData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocTraceData lf = (AllocTraceData) refObj;
!                 AllocClassTraceData newObj = new AllocClassTraceData( sid, up, lf ); 
!                 lf.addClass( newObj );
                  up.addTrace( newObj );             
                  return newObj;          
              }
              case IProf.ALLOC_OBJECT_METHOD_TRACES:{
!                 AllocClassMethodData up = (AllocClassMethodData) refObj;
                  AllocTraceData lf = (AllocTraceData) 
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocClassTraceData newObj = new AllocClassTraceData( sid, up, lf ); 
!                 lf.addClass( newObj );
                  up.addTrace( newObj );
                  return newObj;
--- 743,760 ----
              ////
              case IProf.ALLOC_TRACE_OBJECTS:  {
!                 AllocTypeMethodData up = (AllocTypeMethodData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocTraceData lf = (AllocTraceData) refObj;
!                 AllocTypeTraceData newObj = new AllocTypeTraceData( sid, up, lf ); 
!                 lf.addType( newObj );
                  up.addTrace( newObj );             
                  return newObj;          
              }
              case IProf.ALLOC_OBJECT_METHOD_TRACES:{
!                 AllocTypeMethodData up = (AllocTypeMethodData) refObj;
                  AllocTraceData lf = (AllocTraceData) 
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocTypeTraceData newObj = new AllocTypeTraceData( sid, up, lf ); 
!                 lf.addType( newObj );
                  up.addTrace( newObj );
                  return newObj;
***************
*** 762,768 ****
              ////
              case IProf.ALLOC_OBJECT_THREADS: {
!                 AllocClassData lf = (AllocClassData) refObj;
                  ThreadData up = (ThreadData) libIDs.get( new Integer( sid.parentUpObjId));
!                 AllocThreadClassData newObj = new AllocThreadClassData( sid, up, lf ); 
                  up.addClass( newObj );
                  lf.addThread( newObj );
--- 762,768 ----
              ////
              case IProf.ALLOC_OBJECT_THREADS: {
!                 AllocTypeData lf = (AllocTypeData) refObj;
                  ThreadData up = (ThreadData) libIDs.get( new Integer( sid.parentUpObjId));
!                 AllocThreadTypeData newObj = new AllocThreadTypeData( sid, up, lf ); 
                  up.addClass( newObj );
                  lf.addThread( newObj );
***************
*** 770,777 ****
              }
              case IProf.ALLOC_THREAD_OBJECTS: {
!                 AllocClassData lf = (AllocClassData) 
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
                  ThreadData up = (ThreadData) refObj;
!                 AllocThreadClassData newObj = new AllocThreadClassData( sid, up, lf ); 
                  lf.addThread( newObj );
                  up.addClass( newObj );
--- 770,777 ----
              }
              case IProf.ALLOC_THREAD_OBJECTS: {
!                 AllocTypeData lf = (AllocTypeData) 
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
                  ThreadData up = (ThreadData) refObj;
!                 AllocThreadTypeData newObj = new AllocThreadTypeData( sid, up, lf ); 
                  lf.addThread( newObj );
                  up.addClass( newObj );
***************
*** 780,859 ****
              ////
              case IProf.ALLOC_OBJECT_METHOD_THREADS:{
!                 AllocClassMethodData lf =(AllocClassMethodData) refObj;
!                 AllocThreadClassData up = (AllocThreadClassData)
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadMethodData rg = (AllocThreadMethodData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadClassMethodData newObj = new AllocThreadClassMethodData( 
                                                          sid, up, lf, rg  ); 
                  lf.addThread( newObj );
                  up.addMethod( newObj );
!                 rg.addClass( newObj );           
                  return newObj;
              }
              case IProf.ALLOC_THREAD_OBJECT_METHODS:{
!                 AllocClassMethodData lf =(AllocClassMethodData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadClassData up = (AllocThreadClassData) refObj;
                  AllocThreadMethodData rg = (AllocThreadMethodData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadClassMethodData newObj = new AllocThreadClassMethodData( 
                                                          sid,  up, lf, rg ); 
                  lf.addThread( newObj );
                  up.addMethod( newObj );
!                 rg.addClass( newObj );
                  return newObj;
              }
              case IProf.ALLOC_THREAD_METHOD_OBJECTS:{
!                 AllocClassMethodData lf =(AllocClassMethodData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadClassData up = (AllocThreadClassData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadMethodData rg = (AllocThreadMethodData) refObj;
!                 AllocThreadClassMethodData newObj = new AllocThreadClassMethodData( 
                                                          sid, up, lf, rg ); 
                  lf.addThread( newObj );
                  up.addMethod( newObj );
!                 rg.addClass( newObj ); 
                  return newObj;
              }
              ////
              case IProf.ALLOC_OBJECT_METHOD_TRACE_THREADS:{
!                 AllocClassTraceData lf = (AllocClassTraceData) refObj;
!                 AllocThreadClassMethodData up = (AllocThreadClassMethodData)
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadTraceData rg = (AllocThreadTraceData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadClassTraceData newObj = new AllocThreadClassTraceData( 
                                                          sid, lf, up, rg ); 
                  lf.addThread( newObj );
                  up.addTrace( newObj );
!                 rg.addClass( newObj );
                  return newObj;
              } 
              case IProf.ALLOC_THREAD_METHOD_TRACE_OBJECTS:{
!                 AllocClassTraceData lf = (AllocClassTraceData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadClassMethodData up = (AllocThreadClassMethodData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadTraceData rg = (AllocThreadTraceData) refObj;
!                 AllocThreadClassTraceData newObj =  new AllocThreadClassTraceData( 
                                                          sid, lf, up, rg ); 
                  lf.addThread( newObj );
                  up.addTrace( newObj );
!                 rg.addClass( newObj );             
                  return newObj;
              }
              case IProf.ALLOC_THREAD_OBJECT_METHOD_TRACES:{
!                 AllocClassTraceData lf = (AllocClassTraceData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadClassMethodData up = (AllocThreadClassMethodData) refObj;
                  AllocThreadTraceData rg = (AllocThreadTraceData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadClassTraceData newObj = new AllocThreadClassTraceData( 
                                                          sid, lf, up, rg ); 
                  lf.addThread( newObj );
                  up.addTrace( newObj );
!                 rg.addClass( newObj );       
                  return newObj;
              }
--- 780,859 ----
              ////
              case IProf.ALLOC_OBJECT_METHOD_THREADS:{
!                 AllocTypeMethodData lf =(AllocTypeMethodData) refObj;
!                 AllocThreadTypeData up = (AllocThreadTypeData)
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadMethodData rg = (AllocThreadMethodData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadTypeMethodData newObj = new AllocThreadTypeMethodData( 
                                                          sid, up, lf, rg  ); 
                  lf.addThread( newObj );
                  up.addMethod( newObj );
!                 rg.addType( newObj );           
                  return newObj;
              }
              case IProf.ALLOC_THREAD_OBJECT_METHODS:{
!                 AllocTypeMethodData lf =(AllocTypeMethodData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadTypeData up = (AllocThreadTypeData) refObj;
                  AllocThreadMethodData rg = (AllocThreadMethodData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadTypeMethodData newObj = new AllocThreadTypeMethodData( 
                                                          sid,  up, lf, rg ); 
                  lf.addThread( newObj );
                  up.addMethod( newObj );
!                 rg.addType( newObj );
                  return newObj;
              }
              case IProf.ALLOC_THREAD_METHOD_OBJECTS:{
!                 AllocTypeMethodData lf =(AllocTypeMethodData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadTypeData up = (AllocThreadTypeData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadMethodData rg = (AllocThreadMethodData) refObj;
!                 AllocThreadTypeMethodData newObj = new AllocThreadTypeMethodData( 
                                                          sid, up, lf, rg ); 
                  lf.addThread( newObj );
                  up.addMethod( newObj );
!                 rg.addType( newObj ); 
                  return newObj;
              }
              ////
              case IProf.ALLOC_OBJECT_METHOD_TRACE_THREADS:{
!                 AllocTypeTraceData lf = (AllocTypeTraceData) refObj;
!                 AllocThreadTypeMethodData up = (AllocThreadTypeMethodData)
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadTraceData rg = (AllocThreadTraceData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadTypeTraceData newObj = new AllocThreadTypeTraceData( 
                                                          sid, lf, up, rg ); 
                  lf.addThread( newObj );
                  up.addTrace( newObj );
!                 rg.addType( newObj );
                  return newObj;
              } 
              case IProf.ALLOC_THREAD_METHOD_TRACE_OBJECTS:{
!                 AllocTypeTraceData lf = (AllocTypeTraceData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadTypeMethodData up = (AllocThreadTypeMethodData) 
                                  libIDs.get( new Integer( sid.parentUpObjId ));
                  AllocThreadTraceData rg = (AllocThreadTraceData) refObj;
!                 AllocThreadTypeTraceData newObj =  new AllocThreadTypeTraceData( 
                                                          sid, lf, up, rg ); 
                  lf.addThread( newObj );
                  up.addTrace( newObj );
!                 rg.addType( newObj );             
                  return newObj;
              }
              case IProf.ALLOC_THREAD_OBJECT_METHOD_TRACES:{
!                 AllocTypeTraceData lf = (AllocTypeTraceData)
                                  libIDs.get( new Integer( sid.parentLeftObjId ));
!                 AllocThreadTypeMethodData up = (AllocThreadTypeMethodData) refObj;
                  AllocThreadTraceData rg = (AllocThreadTraceData)
                                  libIDs.get( new Integer( sid.parentRightObjId ));
!                 AllocThreadTypeTraceData newObj = new AllocThreadTypeTraceData( 
                                                          sid, lf, up, rg ); 
                  lf.addThread( newObj );
                  up.addTrace( newObj );
!                 rg.addType( newObj );       
      ...
 
[truncated message content]

[Javaprofiler-commits] CVS: jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data AllocClassData.java,1.8,NONE AllocThreadClassTraceData.java,1.5,NONE AllocThreadClassMethodData.java,1.7,NONE AllocThreadClassData.java,1.7,NONE AllocClassTraceData.java,1.7,NONE AllocClassMethodData.java,1.7,NONE

From: Pavel V. <va...@us...> - 2002-02-15 22:36:24

Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/data
In directory usw-pr-cvs1:/tmp/cvs-serv24304

Removed Files:
	AllocClassData.java AllocThreadClassTraceData.java 
	AllocThreadClassMethodData.java AllocThreadClassData.java 
	AllocClassTraceData.java AllocClassMethodData.java 
Log Message:
code refactorization Class..Data renamed to Type..Data

--- AllocClassData.java DELETED ---

--- AllocThreadClassTraceData.java DELETED ---

--- AllocThreadClassMethodData.java DELETED ---

--- AllocThreadClassData.java DELETED ---

--- AllocClassTraceData.java DELETED ---

--- AllocClassMethodData.java DELETED ---

[Javaprofiler-commits] CVS: jpiimpl readme.txt,1.2,1.3

From: Pavel V. <va...@us...> - 2002-02-14 09:07:34

Update of /cvsroot/javaprofiler/jpiimpl
In directory usw-pr-cvs1:/tmp/cvs-serv15358

Modified Files:
	readme.txt 
Log Message:
problems with line endings

Index: readme.txt
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/readme.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** readme.txt	27 Jan 2002 20:03:57 -0000	1.2
--- readme.txt	14 Feb 2002 09:07:27 -0000	1.3
***************
*** 24,28 ****
  doxygen     generates doxygen documentation
  clean       cleaning
! all         all this, its default
  
  
--- 24,28 ----
  doxygen     generates doxygen documentation
  clean       cleaning
! all         all this

[Javaprofiler-commits] CVS: jpiimpl build.xml,1.6,1.7

From: Pavel V. <va...@us...> - 2002-02-13 11:35:36

Update of /cvsroot/javaprofiler/jpiimpl
In directory usw-pr-cvs1:/tmp/cvs-serv19729

Modified Files:
	build.xml 
Log Message:
default to jar

Index: build.xml
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** build.xml	5 Feb 2002 01:18:29 -0000	1.6
--- build.xml	13 Feb 2002 11:35:31 -0000	1.7
***************
*** 1,33 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <project basedir="../" default="all" name="jpiimpl">
  
! <!--  configuration ************************************************** -->
  
!     <!-- doxygen -->
!     <property name="doxygen_dir" location="D:\Program Files\doxygen-1.2.12"/>
!     <property name="doxygen_exec" location="${doxygen_dir}\bin\doxygen.exe"/>
      
! <!--  end of configuration ******************************************* -->
  
!     <!-- Common classpath -->
!     <path id="project.classpath">
!         <pathelement location="jpiimpl"/>
!         <pathelement location="interface"/>
!     </path>
!     
!     <!-- Common jar pattern set -->
!     <patternset id="project.jarpattern.exclude">
!         <exclude name="**/*.java"/>
!         <exclude name="**/*.bak"/>
!         <exclude name="**/*.form"/>
!         <exclude name="**/.nbattrs"/> 
!         <exclude name="docs"/>
!         <!-- others are in deafult exlcudes (cvsfiles, "*~",".#*", etc.) -->        
!     </patternset>
!     
  
!     <target name="init">
!         <!-- You can set up any variables you want used throughout the script here. -->
!         <property name="hello" value="world"/>
      </target>
      
--- 1,31 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <project basedir="../" default="jar" name="jpiimpl">
  
!     <target name="init">
!         <tstamp/>
!     <!-- You can set up any variables you want used throughout the script here. -->
!     <!--  configuration ************************************************** -->
  
!         <!-- doxygen -->
!         <property name="doxygen_dir" location="D:\Program Files\doxygen-1.2.12"/>
!         <property name="doxygen_exec" location="${doxygen_dir}\bin\doxygen.exe"/>
      
!     <!--  end of configuration ******************************************* -->
  
!         <!-- Common classpath -->
!         <path id="project.classpath">
!             <pathelement location="jpiimpl"/>
!             <pathelement location="interface"/>
!         </path>
  
!         <!-- Common jar pattern set -->
!         <patternset id="project.jarpattern.exclude">
!             <exclude name="**/*.java"/>
!             <exclude name="**/*.bak"/>
!             <exclude name="**/*.form"/>
!             <exclude name="**/.nbattrs"/> 
!             <exclude name="docs"/>
!             <!-- others are in deafult exlcudes (cvsfiles, "*~",".#*", etc.) -->        
!         </patternset>
      </target>

[Javaprofiler-commits] CVS: test/snapshot compare.bat,NONE,1.1 readme.txt,1.2,1.3

From: Pavel V. <va...@us...> - 2002-02-13 11:25:56

Update of /cvsroot/javaprofiler/test/snapshot
In directory usw-pr-cvs1:/tmp/cvs-serv16823

Modified Files:
	readme.txt 
Added Files:
	compare.bat 
Log Message:
comparation of debug outputs

--- NEW FILE: compare.bat ---
sed -f DebugFmt.sed %1 | sort > tmp_a.txt
sed -f DebugFmt.sed %2 | sort > tmp_b.txt
diff tmp_a.txt tmp_b.txt > df.txt
del tmp_a.txt tmp_b.txt

Index: readme.txt
===================================================================
RCS file: /cvsroot/javaprofiler/test/snapshot/readme.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** readme.txt	26 Jan 2002 19:36:18 -0000	1.2
--- readme.txt	13 Feb 2002 11:25:51 -0000	1.3
***************
*** 2,4 ****
  --------------------------------------
  SET CLASSPATH=..\..\jpiimpl\jpiimpl.jar;.\;%CLASSPATH%
! d:\j2sdk1.4.0-rc\bin\javac TestSnap.java PrintSnap.java 
\ No newline at end of file
--- 2,4 ----
  --------------------------------------
  SET CLASSPATH=..\..\jpiimpl\jpiimpl.jar;.\;%CLASSPATH%
! d:\j2sdk1.4.0-rc\bin\javac *.java 
\ No newline at end of file

Flat | Threaded

<< < 1 .. 21 22 23 24 25 .. 40 > >> (Page 23 of 40)

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