Menu
▾
▴
javaprofiler-commits — CVS activity notification list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(73) |
Sep
(92) |
Oct
(9) |
Nov
(80) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(92) |
Feb
(52) |
Mar
(71) |
Apr
(64) |
May
(53) |
Jun
(10) |
Jul
(111) |
Aug
(93) |
Sep
(134) |
Oct
|
Nov
|
Dec
|
|
From: Jan S. <st...@us...> - 2002-01-27 23:10:57
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes
In directory usw-pr-cvs1:/tmp/cvs-serv6304
Modified Files:
SessionNode.java
Log Message:
GC, enableGC, disableGC, createSnapshot actions added.
Index: SessionNode.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes/SessionNode.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** SessionNode.java 2001/10/14 22:18:16 1.1.1.1
--- SessionNode.java 2002/01/27 23:10:55 1.2
***************
*** 30,33 ****
--- 30,34 ----
import org.openide.util.actions.SystemAction;
+ import net.sourceforge.javaprofiler.jpi.Snapshot;
import net.sourceforge.javaprofiler.module.actions.*;
import net.sourceforge.javaprofiler.module.data.Session;
***************
*** 56,60 ****
--- 57,66 ----
return new SystemAction[] {
SystemAction.get(MakeCurrentSessionAction.class),
+ SystemAction.get(SnapshotSessionAction.class),
null,
+ SystemAction.get(GCSessionAction.class),
+ SystemAction.get(DisableGCSessionAction.class),
+ SystemAction.get(EnableGCSessionAction.class),
+ null,
SystemAction.get(SuspendSessionAction.class),
SystemAction.get(ResumeSessionAction.class),
***************
*** 118,125 ****
--- 124,163 ----
}
+ /**
+ * Enables GC in the session.
+ */
+ public void enableGC() {
+ session.getVM().enableGC(true);
+ }
+
+ /**
+ * Disables GC in the session.
+ */
+ public void disableGC() {
+ session.getVM().enableGC(false);
+ }
+
+ /**
+ * Creates snapshot of the session.
+ */
+ public void createSnapshot() {
+ Snapshot snapshot=session.getVM().createSnapshot();
+ ProfilerData.getData().addSnapshot(new net.sourceforge.javaprofiler.module.data.Snapshot(snapshot));
+ }
+
+ /**
+ * Forces GC in the session.
+ */
+ public void gc() {
+ session.getVM().gc();
+ }
+
}
/*
* $Log$
+ * Revision 1.2 2002/01/27 23:10:55 stolis
+ * GC, enableGC, disableGC, createSnapshot actions added.
+ *
* Revision 1.1.1.1 2001/10/14 22:18:16 stolis
* The very first version of profiler module.
|
|
From: Jan S. <st...@us...> - 2002-01-27 23:09:11
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes In directory usw-pr-cvs1:/tmp/cvs-serv5911 Added Files: SessionKiller.java Log Message: Thread that removes disconnected/shutdowned sessions from memory. --- NEW FILE: SessionKiller.java --- /* * Sun Public License Notice * * The contents of this file are subject to the Sun Public License Version * 1.0 (the "License"). You may not use this file except in compliance with * the License. A copy of the License is available at http://www.sun.com/ * * The Original Code is the Java Profiler module. * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha, * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek. * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved. * * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner, * Lukas Petru and Marek Przeczek. */ package net.sourceforge.javaprofiler.module.nodes; import java.util.*; import net.sourceforge.javaprofiler.jpi.VMDisconnectedException; import net.sourceforge.javaprofiler.module.data.Session; import net.sourceforge.javaprofiler.module.data.ProfilerData; /** * Kills session nodes when corresponding sessions are finished. * * @author Jan Stola */ public class SessionKiller extends Thread { public SessionKiller() { } public void run() { try { while (true) { List sessions=ProfilerData.getData().sessions(); Iterator iter=sessions.iterator(); Session session; while (iter.hasNext()) { session=(Session)iter.next(); try { if (session.getVM().isShutdowned()) { session.getVM().shutdown(); ProfilerData.getData().removeSession(session); } } catch (VMDisconnectedException e) { // session disconnected, should be removed from memory ProfilerData.getData().removeSession(session); } } Thread.sleep(2000); } } catch (InterruptedException e) { // terminate the while loop when the thread is interrupted } } } /* * $Log: SessionKiller.java,v $ * Revision 1.1 2002/01/27 23:09:09 stolis * Thread that removes disconnected/shutdowned sessions from memory. * */ |
|
From: Jan S. <st...@us...> - 2002-01-27 23:07:56
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/nodes In directory usw-pr-cvs1:/tmp/cvs-serv5570 Added Files: SnapshotNode.java Log Message: Node for snapshot. --- NEW FILE: SnapshotNode.java --- /* * Sun Public License Notice * * The contents of this file are subject to the Sun Public License Version * 1.0 (the "License"). You may not use this file except in compliance with * the License. A copy of the License is available at http://www.sun.com/ * * The Original Code is the Java Profiler module. * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha, * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek. * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved. * * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner, * Lukas Petru and Marek Przeczek. */ package net.sourceforge.javaprofiler.module.nodes; import java.util.*; import org.openide.TopManager; import org.openide.actions.*; import org.openide.nodes.*; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.actions.SystemAction; import net.sourceforge.javaprofiler.module.data.Snapshot; import net.sourceforge.javaprofiler.module.actions.*; import net.sourceforge.javaprofiler.module.data.ProfilerData; /** * Node for one snapshot. * * @author Jan Stola */ public class SnapshotNode extends AbstractNode implements SnapshotCookie { private Snapshot snapshot; private ResourceBundle bundle=NbBundle.getBundle(SnapshotNode.class); public SnapshotNode(Snapshot snapshot) { super(Children.LEAF); this.snapshot=snapshot; setIconBase("/net/sourceforge/javaprofiler/module/resources/SnapshotNodeIcon"); //setDefaultAction(SystemAction.get(?.class)); setDisplayName(snapshot.getName()); setShortDescription(NbBundle.getMessage(SnapshotNode.class, "HINT_snapshotNode")); getCookieSet().add(this); } protected SystemAction[] createActions() { return new SystemAction[] { SystemAction.get(PropertiesAction.class) }; } public HelpCtx getHelpCtx() { return new HelpCtx(SnapshotNode.class); } protected Sheet createSheet() { Sheet sheet=super.createSheet(); Sheet.Set props=sheet.get(Sheet.PROPERTIES); if (props==null) { props=Sheet.createPropertiesSet(); sheet.put(props); } props.put(new PropertySupport.ReadOnly("name", String.class, bundle.getString("LBL_snapshotName"), bundle.getString("HINT_snapshotName")) { public Object getValue() { return snapshot.getName(); } }); props.put(new PropertySupport.ReadOnly("time", String.class, bundle.getString("LBL_snapshotTime"), bundle.getString("HINT_snapshotTime")) { public Object getValue() { return new Long(snapshot.getSnapshot().time()); } }); return sheet; } public boolean canCopy() { return false; } } /* * $Log: SnapshotNode.java,v $ * Revision 1.1 2002/01/27 23:07:54 stolis * Node for snapshot. * */ |
|
From: Jan S. <st...@us...> - 2002-01-27 23:06:02
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data In directory usw-pr-cvs1:/tmp/cvs-serv5135 Added Files: Snapshot.java Log Message: Wrapper for snapshot. --- NEW FILE: Snapshot.java --- /* * Sun Public License Notice * * The contents of this file are subject to the Sun Public License Version * 1.0 (the "License"). You may not use this file except in compliance with * the License. A copy of the License is available at http://www.sun.com/ * * The Original Code is the Java Profiler module. * The Initial Developers of the Original Code are Jan Stola, Pavel Vacha, * Michal Pise, Petr Luner, Lukas Petru and Marek Przeczek. * Portions created by Jan Stola are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Pavel Vacha are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Michal Pise are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Petr Luner are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Lukas Petru are Copyright (C) 2000-2001. All Rights Reserved. * Portions created by Marek Przeczek are Copyright (C) 2000-2001. All Rights Reserved. * * Contributors: Jan Stola, Pavel Vacha, Michal Pise, Petr Luner, * Lukas Petru and Marek Przeczek. */ package net.sourceforge.javaprofiler.module.data; /** * Snapshot. * * @author Jan Stola */ public class Snapshot { //PENDING reference to file (if the snapshot is saved) /** Mirror of the virtual machine. */ private net.sourceforge.javaprofiler.jpi.Snapshot snapshot; /** * Creates new <code>Snapshot</code>. * * @param snapshot snapshot of some profiled process. */ public Snapshot(net.sourceforge.javaprofiler.jpi.Snapshot vm) { this.snapshot=snapshot; } /** * Returns corresponding <code>net.sourceforge.javaprofiler.jpi.Snapshot</code> object. * * @return <code>net.sourceforge.javaprofiler.jpi.Snapshot</code> object. */ public net.sourceforge.javaprofiler.jpi.Snapshot getSnapshot() { return snapshot; } /** * Returns name of this snapshot. * * @return name of this snapshot. */ public String getName() { return snapshot.getName(); } } /* * $Log: Snapshot.java,v $ * Revision 1.1 2002/01/27 23:05:58 stolis * Wrapper for snapshot. * */ |
|
From: Jan S. <st...@us...> - 2002-01-27 23:04:35
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data
In directory usw-pr-cvs1:/tmp/cvs-serv4848
Modified Files:
ProfilerData.java
Log Message:
References to snapshots added.
Temporary SessionKiller added.
Index: ProfilerData.java
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/data/ProfilerData.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ProfilerData.java 2001/10/14 22:18:16 1.1.1.1
--- ProfilerData.java 2002/01/27 23:04:31 1.2
***************
*** 27,30 ****
--- 27,31 ----
import net.sourceforge.javaprofiler.module.nodes.SessionsNode;
+ import net.sourceforge.javaprofiler.module.nodes.SessionKiller;
/**
***************
*** 35,43 ****
public class ProfilerData {
/** List of Sessions. */
! private List sessions;
/** Index of current session. */
private int current;
/** Sigleton instance of this class. */
private static ProfilerData data;
/**
--- 36,48 ----
public class ProfilerData {
/** List of Sessions. */
! private List sessions;
/** Index of current session. */
private int current;
+ /** List of Snapshots. */
+ private List snapshots;
/** Sigleton instance of this class. */
private static ProfilerData data;
+ /** Session killer. */
+ private static SessionKiller killer;
/**
***************
*** 47,50 ****
--- 52,56 ----
private ProfilerData() {
sessions=new LinkedList();
+ snapshots=new LinkedList();
current=-1;
}
***************
*** 70,73 ****
--- 76,83 ----
sessions.add(session);
current=sessions.size()-1;
+ if (killer==null) {
+ killer=new SessionKiller();
+ killer.start();
+ }
refreshSessions();
}
***************
*** 119,123 ****
/**
! * Refreshes session nodes.
*/
private void refreshSessions() {
--- 129,133 ----
/**
! * Refreshes session and snapshot nodes.
*/
private void refreshSessions() {
***************
*** 126,129 ****
--- 136,168 ----
sessionsNode.update();
}
+
+ /**
+ * Adds snapshot to the list of snapshots.
+ *
+ * @param snapshot added snapshot.
+ */
+ public void addSnapshot(Snapshot snapshot) {
+ snapshots.add(snapshot);
+ refreshSessions();
+ }
+
+ /**
+ * Removes snapshot from the list of snapshots.
+ *
+ * @param snapshot removed snapshot.
+ */
+ public void removeSnapshot(Snapshot snapshot) {
+ snapshots.remove(snapshot);
+ refreshSessions();
+ }
+
+ /**
+ * Returns <code>List</code> of snapshots.
+ *
+ * @return <code>List</code> of <code>Snapshot</code> objects.
+ */
+ public List snapshots() {
+ return new LinkedList(snapshots);
+ }
}
***************
*** 131,134 ****
--- 170,177 ----
/*
* $Log$
+ * Revision 1.2 2002/01/27 23:04:31 stolis
+ * References to snapshots added.
+ * Temporary SessionKiller added.
+ *
* Revision 1.1.1.1 2001/10/14 22:18:16 stolis
* The very first version of profiler module.
|
|
From: Jan S. <st...@us...> - 2002-01-27 23:02:54
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources
In directory usw-pr-cvs1:/tmp/cvs-serv4486
Modified Files:
mf-layer.xml
Log Message:
Added installation of new actions.
Improved installation of the old actions.
Index: mf-layer.xml
===================================================================
RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/mf-layer.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** mf-layer.xml 2001/10/14 22:15:22 1.1.1.1
--- mf-layer.xml 2002/01/27 23:02:51 1.2
***************
*** 31,34 ****
--- 31,38 ----
<file name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
+ <file name="net-sourceforge-javaprofiler-module-actions-GCAction.instance" />
+ <file name="net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance" />
+ <file name="net-sourceforge-javaprofiler-module-actions-DisableGCAction.instance" />
+ <file name="net-sourceforge-javaprofiler-module-actions-SnapshotAction.instance" />
</folder>
</folder>
***************
*** 36,49 ****
<folder name="Menu">
<attr name="Debug/Profiler" boolvalue="true" />
<folder name="Profiler">
- <file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" />
! <file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
</folder>
<attr name="Profiler/Tools" boolvalue="true" />
<folder name="View">
<file name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" />
</folder>
</folder>
--- 40,78 ----
<folder name="Menu">
<attr name="Debug/Profiler" boolvalue="true" />
+ <attr name="Build/Profiler" boolvalue="true" />
<folder name="Profiler">
<file name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance/net-sourceforge-javaprofiler-module-actions-AttachAction.instance" boolvalue="true" />
+ <file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance/net-sourceforge-javaprofiler-module-actions-FinishAction.instance" boolvalue="true" />
+ <file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance/Separator1[javax-swing-JSeparator].instance" boolvalue="true" />
+ <file name="Separator1[javax-swing-JSeparator].instance"/>
+
+ <attr name="Separator1[javax-swing-JSeparator].instance/net-sourceforge-javaprofiler-module-actions-PauseAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance/net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance/Separator2[javax-swing-JSeparator].instance" boolvalue="true" />
! <file name="Separator2[javax-swing-JSeparator].instance"/>
!
! <attr name="Separator2[javax-swing-JSeparator].instance/net-sourceforge-javaprofiler-module-actions-GCAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-GCAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-GCAction.instance/net-sourceforge-javaprofiler-module-actions-DisableGCAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-DisableGCAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-DisableGCAction.instance/net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance/Separator3[javax-swing-JSeparator].instance" boolvalue="true" />
! <file name="Separator3[javax-swing-JSeparator].instance"/>
!
! <attr name="Separator3[javax-swing-JSeparator].instance/net-sourceforge-javaprofiler-module-actions-SnapshotAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-SnapshotAction.instance" />
</folder>
<attr name="Profiler/Tools" boolvalue="true" />
<folder name="View">
+ <attr name="org-netbeans-core-actions-HTMLViewAction.instance/net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" boolvalue="true" />
+ <attr name="org-netbeans-modules-form-actions-FormEditorAction.instance/net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance/org-netbeans-modules-javadoc-search-SearchDocAction.instance" boolvalue="true" />
</folder>
</folder>
***************
*** 51,65 ****
<folder name="Toolbars">
<folder name="Profiler">
- <file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance" />
<file name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" />
! <file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
</folder>
</folder>
! <folder name="Shortcuts">
! <file name="CS-F12[net-sourceforge-javaprofiler-module-actions-AttachAction].instance" />
! <file name="C-8[net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction].instance" />
</folder>
--- 80,105 ----
<folder name="Toolbars">
<folder name="Profiler">
<file name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction.instance/net-sourceforge-javaprofiler-module-actions-AttachAction.instance" boolvalue="true" />
+ <file name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-AttachAction.instance/net-sourceforge-javaprofiler-module-actions-FinishAction.instance" boolvalue="true" />
+ <file name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-FinishAction.instance/net-sourceforge-javaprofiler-module-actions-PauseAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance" />
+ <attr name="net-sourceforge-javaprofiler-module-actions-PauseAction.instance/net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" boolvalue="true" />
<file name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-ContinueAction.instance/net-sourceforge-javaprofiler-module-actions-GCAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-GCAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-GCAction.instance/net-sourceforge-javaprofiler-module-actions-DisableGCAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-DisableGCAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-DisableGCAction.instance/net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance" />
! <attr name="net-sourceforge-javaprofiler-module-actions-EnableGCAction.instance/net-sourceforge-javaprofiler-module-actions-SnapshotAction.instance" boolvalue="true" />
! <file name="net-sourceforge-javaprofiler-module-actions-SnapshotAction.instance" />
</folder>
</folder>
! <folder name="Shortcuts">
! <file name="C-9[net-sourceforge-javaprofiler-module-actions-ProfilerWindowAction].instance" />
</folder>
|
|
From: Jan S. <st...@us...> - 2002-01-27 23:01:42
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources In directory usw-pr-cvs1:/tmp/cvs-serv4139 Modified Files: SessionsNodeIcon.gif SessionNodeIcon.gif ProfilerWindowActionIcon.gif ProfilerSettingsIcon.gif ProfilerNodeIcon.gif ProfilerExecutorIcon.gif PauseActionIcon.gif FinishActionIcon.gif ContinueActionIcon.gif AttachActionIcon.gif Log Message: Temporary version of icons (to be able to distinguish them in the IDE). Index: SessionsNodeIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/SessionsNodeIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsUEr83U and /tmp/cvsM3DUZF differ Index: SessionNodeIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/SessionNodeIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsi0GINW and /tmp/cvsauyZiJ differ Index: ProfilerWindowActionIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/ProfilerWindowActionIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvspomYlY and /tmp/cvsCbXJyM differ Index: ProfilerSettingsIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/ProfilerSettingsIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvscsFlIX and /tmp/cvsqa1EhL differ Index: ProfilerNodeIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/ProfilerNodeIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvspHa2jZ and /tmp/cvskSCXuO differ Index: ProfilerExecutorIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/ProfilerExecutorIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsOCBWFY and /tmp/cvsgr7VcN differ Index: PauseActionIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/PauseActionIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsfrrdm0 and /tmp/cvs4ZhKzQ differ Index: FinishActionIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/FinishActionIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsmZgy31 and /tmp/cvsCyEbYT differ Index: ContinueActionIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/ContinueActionIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsBbgLo1 and /tmp/cvs0LKjES differ Index: AttachActionIcon.gif =================================================================== RCS file: /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources/AttachActionIcon.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsemfN42 and /tmp/cvsc5gV0V differ |
|
From: Jan S. <st...@us...> - 2002-01-27 23:00:12
|
Update of /cvsroot/javaprofiler/module/net/sourceforge/javaprofiler/module/resources In directory usw-pr-cvs1:/tmp/cvs-serv3640 Added Files: SnapshotSessionActionIcon.gif SnapshotNodeIcon32.gif SnapshotNodeIcon.gif SnapshotActionIcon.gif GCSessionActionIcon.gif GCActionIcon.gif EnableGCSessionActionIcon.gif EnableGCActionIcon.gif DisableGCSessionActionIcon.gif DisableGCActionIcon.gif Log Message: Icon placeholders for actions. --- NEW FILE: SnapshotSessionActionIcon.gif --- GIF89a Å×@TCQcq=fïtBN8X«gËD --- NEW FILE: SnapshotNodeIcon32.gif --- GIF89a ~H,TVmh 9 b-r*UG4 4 9 ]:z¬* g«3¢¤¯¹<µÀ®i&Æ& ÉÊËÌ --- NEW FILE: SnapshotNodeIcon.gif --- GIF89a --- NEW FILE: SnapshotActionIcon.gif --- GIF89a --- NEW FILE: GCSessionActionIcon.gif --- GIF89a Å×@TCQcq=fïtBN8X«gËD --- NEW FILE: GCActionIcon.gif --- GIF89a (¢Ä/jÄÐ"Ç 3vØ0$AMjL¹QdF V©°¦M --- NEW FILE: EnableGCSessionActionIcon.gif --- GIF89a Å×@TCQcq=fïtBN8X«gËD --- NEW FILE: EnableGCActionIcon.gif --- GIF89a (¢Ä/jÄÐ"Ç 3vØ0$AMjL¹QdF Véð¡Í --- NEW FILE: DisableGCSessionActionIcon.gif --- GIF89a Å×@TCQcq=fïtBN8X«gËD --- NEW FILE: DisableGCActionIcon.gif --- GIF89a ðxÑáHI@àÊ#GV<ÙpcÇ,qÆ´IæN.)N(!L£G |
|
From: Jan S. <st...@us...> - 2002-01-27 22:56:14
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun
In directory usw-pr-cvs1:/tmp/cvs-serv2589
Modified Files:
CommunSocket.java
Log Message:
initialize() should return false when connection cannot be established.
Index: CommunSocket.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/commun/CommunSocket.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CommunSocket.java 2001/11/21 22:05:55 1.2
--- CommunSocket.java 2002/01/27 22:56:11 1.3
***************
*** 122,126 ****
catch( Exception e) {
! return _failed = true;
}
--- 122,127 ----
catch( Exception e) {
! _failed = true;
! return false;
}
|
|
From: Jan S. <st...@us...> - 2002-01-27 22:52:04
|
Update of /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl
In directory usw-pr-cvs1:/tmp/cvs-serv1447
Modified Files:
VirtualMachineImpl.java
Log Message:
isShutdowned() and shutdown() methods added.
Index: VirtualMachineImpl.java
===================================================================
RCS file: /cvsroot/javaprofiler/jpiimpl/net/sourceforge/javaprofiler/jpiimpl/VirtualMachineImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** VirtualMachineImpl.java 2002/01/15 09:03:41 1.3
--- VirtualMachineImpl.java 2002/01/27 22:51:56 1.4
***************
*** 291,298 ****
--- 291,342 ----
}
+ /**
+ * Shuts profiled JVM down. When profiled JVM is ending, it sends
+ * the JVMPI_EVENT_JVM_SHUTDOWN event to profiler dynamic library.
+ * Then the library waits in JVMPI_EVENT_JVM_SHUTDOWN event handler
+ * until the client calls this method. The goal is the client can make
+ * any necessary calls to gain data before profiled JVM really shutdowns
+ * (so before client's shutdown() call).
+ *
+ * Note: this method doesn't stop running JVM, to stop running JVM,
+ * use exitVM() method instead.
+ *
+ * @see isShutdowned(), exitVM()
+ */
+ public void shutdown() {
+ try {
+ iprof.shutdown();
+ } catch (COMMUN_Exception e) {
+ throw new VMDisconnectedException();
+ }
+ }
+
+ /**
+ * Checks if profiled JVM is shutting down. So, it means, the JVM is no
+ * longer running, the JVMPI_EVENT_JVM_SHUTDOWN event was received and
+ * profiler dynamic library waits in JVMPI_EVENT_JVM_SHUTDOWN event
+ * handler. The client can now gain any necessary data before calling
+ * the shutdown() method which shutdowns JVM definitelly.
+ *
+ * @return true (JVM is shutting down);
+ * false (still running, normal operation)
+ *
+ * @see shutdown(), exitVM()
+ */
+ public boolean isShutdowned() {
+ try {
+ return iprof.isShutdowned();
+ } catch (COMMUN_Exception e) {
+ throw new VMDisconnectedException();
+ }
+ }
+
}
/*
* $Log$
+ * Revision 1.4 2002/01/27 22:51:56 stolis
+ * isShutdowned() and shutdown() methods added.
+ *
* Revision 1.3 2002/01/15 09:03:41 vachis
* no message
|
|
From: Jan S. <st...@us...> - 2002-01-27 22:49:24
|
Update of /cvsroot/javaprofiler/interface/net/sourceforge/javaprofiler/jpi
In directory usw-pr-cvs1:/tmp/cvs-serv659
Modified Files:
VirtualMachine.java
Log Message:
isShutdowned() and shutdown() methods added.
Index: VirtualMachine.java
===================================================================
RCS file: /cvsroot/javaprofiler/interface/net/sourceforge/javaprofiler/jpi/VirtualMachine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** VirtualMachine.java 2001/09/29 20:55:06 1.4
--- VirtualMachine.java 2002/01/27 22:49:17 1.5
***************
*** 107,114 ****
--- 107,146 ----
public void resumeThreads();
+ /**
+ * Checks if profiled JVM is shutting down. So, it means, the JVM is no
+ * longer running, the JVMPI_EVENT_JVM_SHUTDOWN event was received and
+ * profiler dynamic library waits in JVMPI_EVENT_JVM_SHUTDOWN event
+ * handler. The client can now gain any necessary data before calling
+ * the shutdown() method which shutdowns JVM definitelly.
+ *
+ * @return true (JVM is shutting down);
+ * false (still running, normal operation)
+ *
+ * @see shutdown(), exitVM()
+ */
+ public boolean isShutdowned();
+
+ /**
+ * Shuts profiled JVM down. When profiled JVM is ending, it sends
+ * the JVMPI_EVENT_JVM_SHUTDOWN event to profiler dynamic library.
+ * Then the library waits in JVMPI_EVENT_JVM_SHUTDOWN event handler
+ * until the client calls this method. The goal is the client can make
+ * any necessary calls to gain data before profiled JVM really shutdowns
+ * (so before client's shutdown() call).
+ *
+ * Note: this method doesn't stop running JVM, to stop running JVM,
+ * use exitVM() method instead.
+ *
+ * @see isShutdowned(), exitVM()
+ */
+ public void shutdown();
+
}
/*
* $Log$
+ * Revision 1.5 2002/01/27 22:49:17 stolis
+ * isShutdowned() and shutdown() methods added.
+ *
* Revision 1.4 2001/09/29 20:55:06 stolis
* Plural added in licenses.
|
|
From: Pavel V. <va...@us...> - 2002-01-27 20:04:00
|
Update of /cvsroot/javaprofiler/jpiimpl In directory usw-pr-cvs1:/tmp/cvs-serv24961 Modified Files: readme.txt Log Message: no message Index: readme.txt =================================================================== RCS file: /cvsroot/javaprofiler/jpiimpl/readme.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** readme.txt 2002/01/14 08:01:32 1.1 --- readme.txt 2002/01/27 20:03:57 1.2 *************** *** 29,35 **** Example: ------- ! set JAVA_HOME=d:\j2sdk1.4.0-beta3 set CLASSPATH=%CLASSPATH%;d:\netbeans\modules\ant.jar;%JAVA_HOME%\lib\tools.jar ! d:\j2sdk1.4.0-beta3\bin\java org.apache.tools.ant.Main --- 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 |
|
From: Marek P. <ma...@us...> - 2002-01-27 15:17:27
|
Update of /cvsroot/javaprofiler/library/src/commun3
In directory usw-pr-cvs1:/tmp/cvs-serv32198/src/commun3
Modified Files:
semaphore.cpp
Log Message:
a little fix
Index: semaphore.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun3/semaphore.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** semaphore.cpp 2002/01/27 14:33:24 1.4
--- semaphore.cpp 2002/01/27 15:17:24 1.5
***************
*** 55,59 ****
* semaphore stays in system as long as we
* start profiling again or reboot the machine
! * (or remove it manually using 'ipcrm' */
}
--- 55,59 ----
* semaphore stays in system as long as we
* start profiling again or reboot the machine
! * (or remove it manually using 'ipcrm') */
}
***************
*** 82,93 ****
#ifndef WIN32
#ifdef LINUX
! #error FIXME
#else
// we define semun union ourselves on solaris
union {
int val;
! struct semid_ds* buf;
ushort_t* array;
-
} arg;
#endif
--- 82,100 ----
#ifndef WIN32
#ifdef LINUX
! // we define semun union ourselves on linux
! union {
!
! int val;
! semid_ds* buf;
! unsigned short int* array;
! seminfo* __buf;
! } arg;
#else
// we define semun union ourselves on solaris
union {
+
int val;
! semid_ds* buf;
ushort_t* array;
} arg;
#endif
|
|
From: Marek P. <ma...@us...> - 2002-01-27 15:17:27
|
Update of /cvsroot/javaprofiler/library In directory usw-pr-cvs1:/tmp/cvs-serv32198 Modified Files: config.mk Log Message: a little fix Index: config.mk =================================================================== RCS file: /cvsroot/javaprofiler/library/config.mk,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** config.mk 2002/01/27 14:33:24 1.31 --- config.mk 2002/01/27 15:17:24 1.32 *************** *** 1,5 **** ################################################################ # configuration file ! # SunOS 5.8, SPARC/x86, GNU C/C++ 3.0.2 (using GNU make 3.7x) # # author: Marek Przeczek --- 1,5 ---- ################################################################ # configuration file ! # Linux, x86, GNU C/C++ 3.0.2 # # author: Marek Przeczek *************** *** 15,21 **** # do not use "\" as a last character in path definition ! COMPILER_PATH = /home/mprz7483/BIG/gcc-3.0.2 ! JAVA_PATH = /home/mprz7483/BIG/j2sdk1.4.0 ! DOXYGEN_PATH = /home/mprz7483/BIG/doxygen-1.2.12 CCC = "$(COMPILER_PATH)/bin/g++" --- 15,21 ---- # do not use "\" as a last character in path definition ! COMPILER_PATH = /home2/mm/gcc-3.0.2 ! JAVA_PATH = /home2/mm/j2sdk1.4.0 ! DOXYGEN_PATH = /home2/mm CCC = "$(COMPILER_PATH)/bin/g++" *************** *** 37,43 **** # modify as needed ! DEFINES = -DSUNOS -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic ! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/solaris # debug or not ? --- 37,43 ---- # modify as needed ! DEFINES = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic ! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux # debug or not ? *************** *** 49,57 **** LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME) LDLIBS = - - # use this, if you switched off raw monitors (and comment the line above) - # (compilation without -DUSE_RAW_MONITORS) - # - #LDLIBS = -lpthread -lthread LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME) --- 49,52 ---- |
|
From: Marek P. <ma...@us...> - 2002-01-27 15:17:27
|
Update of /cvsroot/javaprofiler/library/src/prof In directory usw-pr-cvs1:/tmp/cvs-serv32198/src/prof Modified Files: lock.cpp Log Message: a little fix Index: lock.cpp =================================================================== RCS file: /cvsroot/javaprofiler/library/src/prof/lock.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** lock.cpp 2002/01/27 14:33:24 1.2 --- lock.cpp 2002/01/27 15:17:25 1.3 *************** *** 54,59 **** /* don't try to destroy the lock, someone else * (another thread) can be still using it; ! * the lock will be destroyed automatically when ! * JVM process finished (or was killed) */ } --- 54,60 ---- /* don't try to destroy the lock, someone else * (another thread) can be still using it; ! * the lock will be destroyed automatically ! * by system after JVM process finished ! * (or was killed) */ } |
|
From: Marek P. <ma...@us...> - 2002-01-27 15:17:27
|
Update of /cvsroot/javaprofiler/library/src/main In directory usw-pr-cvs1:/tmp/cvs-serv32198/src/main Modified Files: includes.h Log Message: a little fix Index: includes.h =================================================================== RCS file: /cvsroot/javaprofiler/library/src/main/includes.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** includes.h 2002/01/27 14:33:24 1.28 --- includes.h 2002/01/27 15:17:24 1.29 *************** *** 52,55 **** --- 52,56 ---- #include <sys/sem.h> #include <sys/shm.h> + #include <sys/time.h> #include <string.h> #include <iostream.h> |
|
From: Marek P. <ma...@us...> - 2002-01-27 14:33:30
|
Update of /cvsroot/javaprofiler/library/config In directory usw-pr-cvs1:/tmp/cvs-serv20943/config Modified Files: config_sparc_sunos58_gcc302.mk Log Message: solaris port of communication interface finished shared memory communication fixed Index: config_sparc_sunos58_gcc302.mk =================================================================== RCS file: /cvsroot/javaprofiler/library/config/config_sparc_sunos58_gcc302.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** config_sparc_sunos58_gcc302.mk 2001/11/21 22:31:38 1.1 --- config_sparc_sunos58_gcc302.mk 2002/01/27 14:33:24 1.2 *************** *** 1,7 **** - # DO NOT USE NOW !!! - ################################################################ # configuration file ! # SunOS 5.8, SPARC, GNU C/C++ 3.0 (using GNU make 3.7x) # # author: Marek Przeczek --- 1,5 ---- ################################################################ # configuration file ! # SunOS 5.8, SPARC/x86, GNU C/C++ 3.0.2 (using GNU make 3.7x) # # author: Marek Przeczek *************** *** 17,23 **** # do not use "\" as a last character in path definition ! COMPILER_PATH = /opt/gcc-3.0 ! JAVA_PATH = /opt/j2sdk1_4_0 ! DOXYGEN_PATH = /opt/doxygen-1.2.10 CCC = "$(COMPILER_PATH)/bin/g++" --- 15,21 ---- # do not use "\" as a last character in path definition ! COMPILER_PATH = /opt/gcc-3.0.2 ! JAVA_PATH = /opt/j2sdk1.4.0-rc ! DOXYGEN_PATH = /opt/doxygen-1.2.12 CCC = "$(COMPILER_PATH)/bin/g++" *************** *** 39,43 **** # modify as needed ! DEFINES = -DSUNOS -fpic -D_REENTRANT INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/solaris --- 37,41 ---- # modify as needed ! DEFINES = -DSUNOS -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/solaris *************** *** 50,57 **** LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME) ! LDLIBS = -lsocket -lpthread -lthread -lnsl LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME) ! LDLIBS2 = -lsocket CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES) --- 48,60 ---- LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME) ! LDLIBS = ! ! # use this, if you switched off raw monitors (and comment the line above) ! # (compilation without -DUSE_RAW_MONITORS) ! # ! #LDLIBS = -lpthread -lthread LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME) ! LDLIBS2 = CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES) *************** *** 68,69 **** --- 71,73 ---- clean: $(addsuffix .clean.2, $(DIRS)) rm -Rf $(CLEAN_FILES) + |
|
From: Marek P. <ma...@us...> - 2002-01-27 14:33:30
|
Update of /cvsroot/javaprofiler/library/src/prof
In directory usw-pr-cvs1:/tmp/cvs-serv20943/src/prof
Modified Files:
lock.cpp
Log Message:
solaris port of communication interface finished
shared memory communication fixed
Index: lock.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/prof/lock.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lock.cpp 2001/11/21 22:31:44 1.1
--- lock.cpp 2002/01/27 14:33:24 1.2
***************
*** 52,64 ****
Lock::~Lock() {
! #ifdef USE_RAW_MONITORS
! //Prof::prof().jvmpiInterface->RawMonitorDestroy( _rm);
! #else
! #ifdef WIN32
! //DeleteCriticalSection( &cs);
! #else
! //pthread_mutex_destroy( &cs);
! #endif
! #endif
}
--- 52,59 ----
Lock::~Lock() {
! /* don't try to destroy the lock, someone else
! * (another thread) can be still using it;
! * the lock will be destroyed automatically when
! * JVM process finished (or was killed) */
}
|
|
From: Marek P. <ma...@us...> - 2002-01-27 14:33:30
|
Update of /cvsroot/javaprofiler/library/src/commun3
In directory usw-pr-cvs1:/tmp/cvs-serv20943/src/commun3
Modified Files:
semaphore.cpp sharedMemory.cpp
Log Message:
solaris port of communication interface finished
shared memory communication fixed
Index: semaphore.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun3/semaphore.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** semaphore.cpp 2002/01/26 22:50:27 1.3
--- semaphore.cpp 2002/01/27 14:33:24 1.4
***************
*** 41,45 ****
#else
_semid = semget( *(key_t*)(const char*)name, 1, 0666 | IPC_CREAT);
! semctl( _semid, 0, SETVAL, 1);
#endif
}
--- 41,45 ----
#else
_semid = semget( *(key_t*)(const char*)name, 1, 0666 | IPC_CREAT);
! reset();
#endif
}
***************
*** 50,53 ****
--- 50,59 ----
CloseHandle( _semid);
#endif
+
+ /* don't destroy semaphore on Unix, because
+ * another process can be still using it !
+ * semaphore stays in system as long as we
+ * start profiling again or reboot the machine
+ * (or remove it manually using 'ipcrm' */
}
***************
*** 75,79 ****
#ifndef WIN32
! semctl( _semid, 0, SETVAL, 1);
#endif
}
--- 81,102 ----
#ifndef WIN32
! #ifdef LINUX
! #error FIXME
! #else
! // we define semun union ourselves on solaris
! union {
! int val;
! struct semid_ds* buf;
! ushort_t* array;
!
! } arg;
#endif
+ arg.val = 1;
+ semctl( _semid, 0, SETVAL, arg);
+ #endif
+
+ /* not necessary to reset semaphore on Win32,
+ * JVM goes well together with the system
+ * and it seems there are no problems
+ * with semaphore counter */
}
Index: sharedMemory.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun3/sharedMemory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** sharedMemory.cpp 2001/11/21 22:31:42 1.1
--- sharedMemory.cpp 2002/01/27 14:33:24 1.2
***************
*** 57,60 ****
--- 57,65 ----
CloseHandle( _shmid);
#else
+ /* only detach, don't destroy, another process
+ * can be still using it ! shared memory block will
+ * stay in system memory forever (til next start
+ * of profiling or reboot) */
+
shmdt( _address);
#endif
|
|
From: Marek P. <ma...@us...> - 2002-01-27 14:33:30
|
Update of /cvsroot/javaprofiler/library/src/main In directory usw-pr-cvs1:/tmp/cvs-serv20943/src/main Modified Files: includes.h Log Message: solaris port of communication interface finished shared memory communication fixed Index: includes.h =================================================================== RCS file: /cvsroot/javaprofiler/library/src/main/includes.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** includes.h 2001/11/25 22:33:47 1.27 --- includes.h 2002/01/27 14:33:24 1.28 *************** *** 43,50 **** #include <iostream.h> #else ! #ifdef SUNOS ! // SUNOS headers ! #else ! // LINUX headers #include <sys/types.h> #include <netinet/in.h> --- 43,47 ---- #include <iostream.h> #else ! // LINUX and SUNOS headers #include <sys/types.h> #include <netinet/in.h> *************** *** 52,60 **** #include <unistd.h> #include <netdb.h> - #include <stdlib.h> #include <sys/ipc.h> #include <sys/sem.h> #include <sys/shm.h> - #include <sys/time.h> #include <string.h> #include <iostream.h> --- 49,55 ---- *************** *** 66,70 **** #endif - #endif #endif --- 61,64 ---- |
|
From: Marek P. <ma...@us...> - 2002-01-27 14:33:28
|
Update of /cvsroot/javaprofiler/library In directory usw-pr-cvs1:/tmp/cvs-serv20943 Modified Files: README TODO config.mk Log Message: solaris port of communication interface finished shared memory communication fixed Index: README =================================================================== RCS file: /cvsroot/javaprofiler/library/README,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** README 2002/01/26 10:19:43 1.33 --- README 2002/01/27 14:33:24 1.34 *************** *** 1,3 **** ! Java Profiling Tool (http://javaprofiler.sourceforge.net/) beta version --- 1,3 ---- ! Java Profiling Tool beta version *************** *** 5,8 **** --- 5,10 ---- CONTENTS + 0. INTRODUCTION + 1. REQUIREMENTS *************** *** 33,36 **** --- 35,55 ---- 8. COPYRIGHT and LICENSE + + + 0. INTRODUCTION + + Main goal of Java Profiling Tool project is to develop fast and fully + functional Java profiler module using experimental JDK's JVMPI interface. + End part of project (and for most people the main one) is a profiler GUI + plug-in for Forte4j development environment. It uses functions of special + dynamic profiling library which is ported to Microsoft Windows 9x/NT/2000 + operating systems, Linux and SunOS 7/8. The rest of package (including + client side of communication interface and GUI plug-in) is developed + in Java and that's why it is fully portable to all named operating systems. + + This package contains sources of dynamic profiler library. + + You can find more information at Java Profiling Tool project's webpage + http://javaprofiler.sourceforge.net/ . Index: TODO =================================================================== RCS file: /cvsroot/javaprofiler/library/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** TODO 2002/01/26 23:52:44 1.4 --- TODO 2002/01/27 14:33:24 1.5 *************** *** 1,9 **** 2002-01-27 ! This _MUST_ really be done in near future: ! ! * port to Solaris ! ! New features will be implemented later: * CallTree - both for sampling and exact methods of CPU profiling --- 1,5 ---- 2002-01-27 ! These features should be implemented in the future: * CallTree - both for sampling and exact methods of CPU profiling Index: config.mk =================================================================== RCS file: /cvsroot/javaprofiler/library/config.mk,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** config.mk 2002/01/26 23:52:44 1.30 --- config.mk 2002/01/27 14:33:24 1.31 *************** *** 1,5 **** ################################################################ # configuration file ! # Linux, x86, GNU C/C++ 3.0.2 # # author: Marek Przeczek --- 1,5 ---- ################################################################ # configuration file ! # SunOS 5.8, SPARC/x86, GNU C/C++ 3.0.2 (using GNU make 3.7x) # # author: Marek Przeczek *************** *** 15,21 **** # do not use "\" as a last character in path definition ! COMPILER_PATH = /home2/mm/gcc-3.0.2 ! JAVA_PATH = /home2/mm/j2sdk1.4.0 ! DOXYGEN_PATH = /home2/mm CCC = "$(COMPILER_PATH)/bin/g++" --- 15,21 ---- # do not use "\" as a last character in path definition ! COMPILER_PATH = /home/mprz7483/BIG/gcc-3.0.2 ! JAVA_PATH = /home/mprz7483/BIG/j2sdk1.4.0 ! DOXYGEN_PATH = /home/mprz7483/BIG/doxygen-1.2.12 CCC = "$(COMPILER_PATH)/bin/g++" *************** *** 37,43 **** # modify as needed ! DEFINES = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic ! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux # debug or not ? --- 37,43 ---- # modify as needed ! DEFINES = -DSUNOS -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic ! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/solaris # debug or not ? *************** *** 49,52 **** --- 49,57 ---- LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME) LDLIBS = + + # use this, if you switched off raw monitors (and comment the line above) + # (compilation without -DUSE_RAW_MONITORS) + # + #LDLIBS = -lpthread -lthread LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME) |
|
From: Marek P. <ma...@us...> - 2002-01-26 23:52:47
|
Update of /cvsroot/javaprofiler/library/demo/04
In directory usw-pr-cvs1:/tmp/cvs-serv7830/demo/04
Modified Files:
Test.java
Log Message:
fixes
Index: Test.java
===================================================================
RCS file: /cvsroot/javaprofiler/library/demo/04/Test.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Test.java 2002/01/26 22:50:27 1.3
--- Test.java 2002/01/26 23:52:44 1.4
***************
*** 118,122 ****
// initialize and start communication
// sockets are used by default
! iprof = new IProf();
iprof.run();
--- 118,122 ----
// initialize and start communication
// sockets are used by default
! iprof = new IProf();
iprof.run();
***************
*** 124,134 ****
// til profiled program is going, do nothing
! while( !iprof.isShutdowned()) {
System.out.println( "waiting...");
Thread.sleep( 1000);
! }
! // profiled program has finished, so ask for all classes
askForClasses();
--- 124,134 ----
// til profiled program is going, do nothing
! while( !iprof.isShutdowned()) {
System.out.println( "waiting...");
Thread.sleep( 1000);
! }
! // profiled program has finished, so ask for all classes
askForClasses();
|
|
From: Marek P. <ma...@us...> - 2002-01-26 23:52:46
|
Update of /cvsroot/javaprofiler/library
In directory usw-pr-cvs1:/tmp/cvs-serv7830
Modified Files:
TODO config.mk
Log Message:
fixes
Index: TODO
===================================================================
RCS file: /cvsroot/javaprofiler/library/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** TODO 2002/01/26 10:19:43 1.3
--- TODO 2002/01/26 23:52:44 1.4
***************
*** 1,8 ****
! 2002-01-26
This _MUST_ really be done in near future:
- * try if switching sides of communication really works now
- * check shared memory communication and fix it if needed
* port to Solaris
--- 1,6 ----
! 2002-01-27
This _MUST_ really be done in near future:
* port to Solaris
Index: config.mk
===================================================================
RCS file: /cvsroot/javaprofiler/library/config.mk,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** config.mk 2002/01/26 22:50:27 1.29
--- config.mk 2002/01/26 23:52:44 1.30
***************
*** 1,12 ****
################################################################
# configuration file
! # Microsoft Windows 9x/NT4.0/2000, x86, Visual C/C++ 6.0
#
# author: Marek Przeczek
! PROF_LIBRARY_NAME = profiler\profiler.dll
PROF_JAVA_INTERF_PACKAGE = IProf.jar
! NATIVE_LIBRARY_NAME = CommunShMem.dll
################################################################
--- 1,12 ----
################################################################
# configuration file
! # Linux, x86, GNU C/C++ 3.0.2
#
# author: Marek Przeczek
! PROF_LIBRARY_NAME = profiler/libprofiler.so
PROF_JAVA_INTERF_PACKAGE = IProf.jar
! NATIVE_LIBRARY_NAME = libCommunShMem.so
################################################################
***************
*** 15,28 ****
# do not use "\" as a last character in path definition
! COMPILER_PATH = E:\Program Files\Microsoft Visual Studio\VC98
! JAVA_PATH = E:\j2sdk1.4.0-rc
! DOXYGEN_PATH = E:\Program Files\doxygen-1.2.12
!
! CCC = "$(COMPILER_PATH)\Bin\cl"
! LD = "$(COMPILER_PATH)\Bin\link"
! JAVAC = "$(JAVA_PATH)\bin\javac"
! JAVAH = "$(JAVA_PATH)\bin\javah"
! JAR = "$(JAVA_PATH)\bin\jar"
! DOXYGEN = "$(DOXYGEN_PATH)\bin\doxygen"
################################################################
--- 15,28 ----
# do not use "\" as a last character in path definition
! COMPILER_PATH = /home2/mm/gcc-3.0.2
! JAVA_PATH = /home2/mm/j2sdk1.4.0
! DOXYGEN_PATH = /home2/mm
!
! CCC = "$(COMPILER_PATH)/bin/g++"
! LD = "$(COMPILER_PATH)/bin/g++"
! JAVAC = "$(JAVA_PATH)/bin/javac"
! JAVAH = "$(JAVA_PATH)/bin/javah"
! JAR = "$(JAVA_PATH)/bin/jar"
! DOXYGEN = "$(DOXYGEN_PATH)/bin/doxygen"
################################################################
***************
*** 31,35 ****
DOXYGENFLAGS =
! JAVACFLAGS = -classpath ..\..\src2\$(PROF_JAVA_INTERF_PACKAGE)
################################################################
--- 31,35 ----
DOXYGENFLAGS =
! JAVACFLAGS = -classpath ../../src2/$(PROF_JAVA_INTERF_PACKAGE)
################################################################
***************
*** 37,70 ****
# modify as needed
! DEFINES = /DWIN32 /DUSE_RAW_MONITORS /DUSE_ALLOCATOR
! INCLUDES = /I "$(JAVA_PATH)\include" /I "$(JAVA_PATH)\include\win32"
# debug or not ?
# choose one of following two possibilities
! FLAGS = /Od /Zi /D_DEBUG /MDd /LDd
! #FLAGS = /O2 /Og /Oi /Ot /Ox /DNDEBUG /MD /LD /G6 /GD
! LDFLAGS = /NOLOGO /DLL /OUT:$(PROF_LIBRARY_NAME)
! LDLIBS = wsock32.lib winmm.lib
! LDFLAGS2 = /NOLOGO /DLL /OUT:$(NATIVE_LIBRARY_NAME)
LDLIBS2 =
! CPPFLAGS = /nologo /c $(FLAGS) $(DEFINES) $(INCLUDES)
################################################################
# MAKEFILE
! MFLAGS = /NOLOGO /f Makefile.mak
include dir.info
! all:
! for %i in (xxx $(DIRS)) do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.dir
! for %i in (xxx $(FILES)) do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.obj
!
! clean:
! for %i in (xxx $(CLEAN_FILES)) do if exist %%i del %%i
! for %i in (xxx $(DIRS)) do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.clean
--- 37,68 ----
# modify as needed
! DEFINES = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -fpic
! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux
# debug or not ?
# choose one of following two possibilities
! FLAGS = -O0 -D_DEBUG
! #FLAGS = -O3 -DNDEBUG -fno-rtti -fno-exceptions
! LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME)
! LDLIBS =
! LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME)
LDLIBS2 =
! CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES)
################################################################
# MAKEFILE
! MFLAGS = -f Makefile -C
include dir.info
! all: $(addsuffix .dir.2, $(DIRS)) $(addsuffix .o, $(FILES))
!
! clean: $(addsuffix .clean.2, $(DIRS))
! rm -Rf $(CLEAN_FILES)
!
|
|
From: Marek P. <ma...@us...> - 2002-01-26 22:50:30
|
Update of /cvsroot/javaprofiler/library/src2 In directory usw-pr-cvs1:/tmp/cvs-serv26803/src2 Modified Files: CommunShMem.cpp Log Message: fixes of shared memory communication for win32 Index: CommunShMem.cpp =================================================================== RCS file: /cvsroot/javaprofiler/library/src2/CommunShMem.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** CommunShMem.cpp 2002/01/26 10:38:25 1.8 --- CommunShMem.cpp 2002/01/26 22:50:27 1.9 *************** *** 66,70 **** #ifdef WIN32 ! #error FIXME #else /// server process ID --- 66,71 ---- #ifdef WIN32 ! /// server process ID ! DWORD pid; #else /// server process ID *************** *** 180,184 **** #ifdef WIN32 ! #error FIXME #else return !kill( pid, 0); --- 181,185 ---- #ifdef WIN32 ! return GetProcessVersion( pid); #else return !kill( pid, 0); *************** *** 335,339 **** #ifdef WIN32 ! #error FIXME #else pid_t* p = (pid_t*)((jint*)(n->shmem.getAddress())+1); --- 336,342 ---- #ifdef WIN32 ! DWORD* p = (DWORD*)((jint*)(n->shmem.getAddress())+1); ! ! *p = GetCurrentProcessId(); #else pid_t* p = (pid_t*)((jint*)(n->shmem.getAddress())+1); *************** *** 345,353 **** n->sem2.wait(); - #ifdef WIN32 - #error FIXME - #else n->pid = *p; - #endif return JNI_TRUE; --- 348,352 ---- |
|
From: Marek P. <ma...@us...> - 2002-01-26 22:50:30
|
Update of /cvsroot/javaprofiler/library/src/commun3
In directory usw-pr-cvs1:/tmp/cvs-serv26803/src/commun3
Modified Files:
communShMem.cpp communShMem.h semaphore.cpp semaphore.h
Log Message:
fixes of shared memory communication for win32
Index: communShMem.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun3/communShMem.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** communShMem.cpp 2002/01/26 10:19:44 1.7
--- communShMem.cpp 2002/01/26 22:50:27 1.8
***************
*** 161,170 ****
#ifdef WIN32
! #error FIXME
#else
pid_t* p = (pid_t*)((jint*)(_shmem.getAddress())+1);
_pid = *p;
! *p = getpid();
#endif
--- 161,173 ----
#ifdef WIN32
! DWORD* p = (DWORD*)((jint*)(_shmem.getAddress())+1);
!
! _pid = *p;
! *p = GetCurrentProcessId();
#else
pid_t* p = (pid_t*)((jint*)(_shmem.getAddress())+1);
_pid = *p;
! *p = getpid();
#endif
***************
*** 177,181 ****
#ifdef WIN32
! #error FIXME
#else
return !kill( _pid, 0);
--- 180,184 ----
#ifdef WIN32
! return GetProcessVersion( _pid);
#else
return !kill( _pid, 0);
Index: communShMem.h
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun3/communShMem.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** communShMem.h 2002/01/26 10:19:44 1.6
--- communShMem.h 2002/01/26 22:50:27 1.7
***************
*** 65,69 ****
#ifdef WIN32
! #error FIXME
#else
/// client process ID
--- 65,70 ----
#ifdef WIN32
! /// client process ID
! DWORD _pid;
#else
/// client process ID
Index: semaphore.cpp
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun3/semaphore.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** semaphore.cpp 2002/01/26 10:19:44 1.2
--- semaphore.cpp 2002/01/26 22:50:27 1.3
***************
*** 38,43 ****
#ifdef WIN32
! #error FIXME
! // _semid = CreateSemaphore( NULL, (( locked) ? 0 : 1), 1, name);
#else
_semid = semget( *(key_t*)(const char*)name, 1, 0666 | IPC_CREAT);
--- 38,42 ----
#ifdef WIN32
! _semid = CreateSemaphore( NULL, 0, 1, name);
#else
_semid = semget( *(key_t*)(const char*)name, 1, 0666 | IPC_CREAT);
***************
*** 49,55 ****
#ifdef WIN32
! #error FIXME
! // CloseHandle( _semid);
! #else
#endif
}
--- 48,52 ----
#ifdef WIN32
! CloseHandle( _semid);
#endif
}
***************
*** 58,64 ****
#ifdef WIN32
! #error FIXME
! // WaitForSingleObject( _semid, INFINITE);
! // Sleep( 0);
#else
static sembuf sop[2] = { 0, 0, 0, 0, 1, SEM_UNDO};
--- 55,59 ----
#ifdef WIN32
! WaitForSingleObject( _semid, INFINITE);
#else
static sembuf sop[2] = { 0, 0, 0, 0, 1, SEM_UNDO};
***************
*** 70,76 ****
#ifdef WIN32
! #error FIXME
! // ReleaseSemaphore( _semid, 1, NULL);
! ////Sleep( 0);
#else
static sembuf sop = { 0, -1, SEM_UNDO | IPC_NOWAIT};
--- 65,69 ----
#ifdef WIN32
! ReleaseSemaphore( _semid, 1, NULL);
#else
static sembuf sop = { 0, -1, SEM_UNDO | IPC_NOWAIT};
***************
*** 81,87 ****
void Semaphore::reset() {
! #ifdef WIN32
! #error FIXME
! #else
semctl( _semid, 0, SETVAL, 1);
#endif
--- 74,78 ----
void Semaphore::reset() {
! #ifndef WIN32
semctl( _semid, 0, SETVAL, 1);
#endif
Index: semaphore.h
===================================================================
RCS file: /cvsroot/javaprofiler/library/src/commun3/semaphore.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** semaphore.h 2002/01/26 10:19:44 1.7
--- semaphore.h 2002/01/26 22:50:27 1.8
***************
*** 84,88 ****
/** Reset semaphore. It resets semaphore and sets its
! ** default value (locked by one). */
void reset();
--- 84,89 ----
/** Reset semaphore. It resets semaphore and sets its
! ** default value (locked by one). Implemented only
! ** on Unix systems because of troubles with JVM. */
void reset();
|
