Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Baron2010-08-06 14:34:46 -0400
committerElliott Baron2010-08-06 14:34:46 -0400
commite8325513a8a7cbfc7e89a3e1cc8cbb6b7be2185a (patch)
tree87260fe08a84e9eddef87f1262120b2693688223
parent0fc593985c4f9b9b1bebed43e96d434be3565483 (diff)
downloadorg.eclipse.linuxtools-e8325513a8a7cbfc7e89a3e1cc8cbb6b7be2185a.tar.gz
org.eclipse.linuxtools-e8325513a8a7cbfc7e89a3e1cc8cbb6b7be2185a.tar.xz
org.eclipse.linuxtools-e8325513a8a7cbfc7e89a3e1cc8cbb6b7be2185a.zip
Fixed repeat launches not working, added arguments tab with no WD block, fixed issues with Cachegrind and Massif on remote.
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog4
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog12
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java9
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java6
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java1
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog5
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java2
11 files changed, 39 insertions, 8 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog
index 09a8378854..ead127f0fb 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-06 Elliott Baron <ebaron@fedoraproject.org>
+
+ * src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java (initializeView): Check that outputs are not null.
+
2010-08-03 Elliott Baron <ebaron@fedoraproject.org>
* src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CollapseAction.java: New file.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java
index 3a1bcd1171..3f882e1ba1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java
@@ -97,7 +97,7 @@ public class CachegrindLaunchDelegate implements IValgrindLaunchDelegate {
public void initializeView(IValgrindToolView view, String contentDescription, IProgressMonitor monitor)
throws CoreException {
- if (view instanceof CachegrindViewPart) {
+ if (outputs != null && view instanceof CachegrindViewPart) {
((CachegrindViewPart) view).setOutputs(outputs);
}
monitor.worked(1);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog
index f0fa50435e..51da465361 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-06 Elliott Baron <ebaron@fedoraproject.org>
+
+ * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java (RemoteLaunchStep): Store name.
+ (toString): Use launch step name.
+ * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java (launch): Reset process to null, since delegate
+ can be reused by caller.
+ (disconnect): Actually disconnect if channel is not closed.
+ * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java (getProfileTabs): Arguments
+ Working Directory problem has been fixed in superclass.
+ * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java (refreshPeerViewer): Ensure content provider is set.
+ * src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java (.doneRead): Added FIXME: Problems with losing data.
+
2010-08-03 Elliott Baron <ebaron@fedoraproject.org>
* icons/tcf.gif: New file.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java
index 05d357153e..a9cf0a71b7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/RemoteLaunchStep.java
@@ -19,13 +19,13 @@ public abstract class RemoteLaunchStep {
private Queue<RemoteLaunchStep> steps;
private IChannel channel;
-// private String name;
+ private String name;
// private static int indent = 0;
public RemoteLaunchStep(Queue<RemoteLaunchStep> steps, IChannel channel, String name) {
this.steps = steps;
this.channel = channel;
-// this.name = name;
+ this.name = name;
steps.add(this);
}
@@ -55,6 +55,11 @@ public abstract class RemoteLaunchStep {
channel.terminate(x);
}
}
+
+ @Override
+ public String toString() {
+ return name;
+ }
// private void printSpaces() {
// for (int i = 0; i < indent; i++) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java
index a56af40db7..cffb86d3fc 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchDelegate.java
@@ -76,6 +76,9 @@ ValgrindLaunchConfigurationDelegate {
m = new NullProgressMonitor();
}
launchSteps = new ConcurrentLinkedQueue<RemoteLaunchStep>();
+
+ // Clear process as we wait on it to be instantiated
+ process = null;
monitor = SubMonitor
.convert(
@@ -377,6 +380,9 @@ ValgrindLaunchConfigurationDelegate {
// Delete files, don't try to copy
cleanup(t);
}
+ if (channel.getState() != IChannel.STATE_CLOSED) {
+ channel.terminate(t);
+ }
}
private void writeFileToRemote(IPath localFile, IPath remoteFile, final RemoteLaunchStep step) throws CoreException, FileNotFoundException {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java
index 75a2164212..33240317f4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteLaunchTabGroup.java
@@ -19,7 +19,6 @@ public class ValgrindRemoteLaunchTabGroup extends
@Override
public AbstractLaunchConfigurationTab[] getProfileTabs() {
- // FIXME Arguments Tab W.D.
return new AbstractLaunchConfigurationTab[] { new ValgrindRemoteTab(), new ValgrindOptionsTab(false) };
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java
index 69a6c7f6ec..faced10d63 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindRemoteTab.java
@@ -308,7 +308,7 @@ public class ValgrindRemoteTab extends AbstractLaunchConfigurationTab {
}
private void refreshPeerViewer() {
- if (tableViewer != null) {
+ if (tableViewer != null && tableViewer.getContentProvider() != null) {
tableViewer.setInput(peers.values().toArray(new IPeer[peers.size()]));
tableViewer.refresh();
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java
index bb0292b8d1..f4cff05a5d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch.remote/src/org/eclipse/linuxtools/internal/valgrind/launch/remote/ValgrindTCFInputStream.java
@@ -61,7 +61,7 @@ public class ValgrindTCFInputStream extends InputStream {
}
else {
buf = data;
- if (eos) {
+ if (eos) { // FIXME We are getting EOS too soon, and losing data
ValgrindTCFInputStream.this.eos = true;
streamsService.disconnect(streamId, new IStreams.DoneDisconnect() {
public void doneDisconnect(IToken token, Exception error) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
index f774ef1fae..2cfdbf8a28 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-06 Elliott Baron <ebaron@fedoraproject.org>
+
+ * src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java (initializeView): Check that output is not null.
+ * src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java (getInputName): Modify substring expression.
+
2010-08-03 Elliott Baron <ebaron@fedoraproject.org>
* src/org/eclipse/linuxtools/internal/valgrind/massif/CollapseAction.java: New file.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java
index 8a48735a75..fcf6cc2f50 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java
@@ -101,7 +101,7 @@ public class MassifLaunchDelegate implements IValgrindLaunchDelegate {
}
public void initializeView(IValgrindToolView view, String contentDescription, IProgressMonitor monitor) throws CoreException {
- if (view instanceof MassifViewPart) {
+ if (output != null && view instanceof MassifViewPart) {
((MassifViewPart) view).setChartName(contentDescription);
((MassifViewPart) view).setOutput(output);
// initialize to first pid
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
index b9f1024260..2857f23861 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
@@ -322,7 +322,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
protected String getInputName(String description) {
String launchName = description.substring(0, description
- .indexOf("[massif]")); //$NON-NLS-1$
+ .indexOf("[massif")); //$NON-NLS-1$
return launchName.trim();
}

Back to the top