mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-09 19:43:27 +02:00
Code Issues Wiki Activity

Reversing changes made to fix bug 107571. The fix for bug 119683 covers this problem too. Inferior process shouldn't be shown as a part of the attach session.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2006-01-25 19:19:21 +00:00
parent 16f558adbe
commit ca2ea100c4
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
launch/org.eclipse.cdt.launch/ChangeLog
View file

@ -1,3 +1,9 @@
2006-01-25 Mikhail Khodjaiants
Reversing changes made to fix bug 107571. The fix for bug 119683 covers this problem too.
Inferior process shouldn't be shown as a part of the attach session.
* LocalCDILaunchDelegate.java
* LocalAttachLaunchDelegate.java
2006-01-23 Mikhail Khodjaiants 2006-01-23 Mikhail Khodjaiants
Bug 119683: long messages during launch cause gdb to timeout, launch to fail. Bug 119683: long messages during launch cause gdb to timeout, launch to fail.
+ LocalCDILaunchDelegate.java + LocalCDILaunchDelegate.java

10
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalAttachLaunchDelegate.java
View file

@ -11,7 +11,6 @@
package org.eclipse.cdt.launch.internal; package org.eclipse.cdt.launch.internal;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.debug.core.CDIDebugModel; import org.eclipse.cdt.debug.core.CDIDebugModel;
@ -37,7 +36,6 @@ import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.IStatusHandler; import org.eclipse.debug.core.IStatusHandler;
import org.eclipse.debug.core.model.IProcess;
public class LocalAttachLaunchDelegate extends AbstractCLaunchDelegate { public class LocalAttachLaunchDelegate extends AbstractCLaunchDelegate {
@ -105,14 +103,8 @@ public class LocalAttachLaunchDelegate extends AbstractCLaunchDelegate {
setDefaultSourceLocator(launch, config); setDefaultSourceLocator(launch, config);
ICDITarget[] targets = dsession.getTargets(); ICDITarget[] targets = dsession.getTargets();
for (int i = 0; i < targets.length; i++) { for (int i = 0; i < targets.length; i++) {
Process process = targets[i].getProcess();
IProcess iprocess = null;
if (process != null) {
iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(exePath.toOSString()), getDefaultProcessMap());
}
CDIDebugModel.newDebugTarget(launch, cproject.getProject(), targets[i], CDIDebugModel.newDebugTarget(launch, cproject.getProject(), targets[i],
renderTargetLabel(debugConfig), iprocess, exeFile, true, true, false); renderTargetLabel(debugConfig), null, exeFile, true, true, false);
} }
} catch (CoreException e) { } catch (CoreException e) {
try { try {

7
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
View file

@ -204,12 +204,7 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate {
try { try {
ICDITarget[] targets = dsession.getTargets(); ICDITarget[] targets = dsession.getTargets();
for( int i = 0; i < targets.length; i++ ) { for( int i = 0; i < targets.length; i++ ) {
Process process = targets[i].getProcess(); CDIDebugModel.newDebugTarget( launch, project.getProject(), targets[i], renderTargetLabel( debugConfig ), null, exeFile, true, true, false );
IProcess iprocess = null;
if ( process != null ) {
iprocess = DebugPlugin.newProcess( launch, process, renderProcessLabel( exePath.toOSString() ), getDefaultProcessMap() );
}
CDIDebugModel.newDebugTarget( launch, project.getProject(), targets[i], renderTargetLabel( debugConfig ), iprocess, exeFile, true, true, false );
} }
} }
catch( CoreException e ) { catch( CoreException e ) {