mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-16 21:45:22 +02:00
Code Issues Wiki Activity

Bug 231129

Browse source 
Enhances the launch code to allow for a RemoteAttach as part of the
current Attach launch configuration type.
This commit is contained in:
Marc Khouzam 2008-05-15 19:44:14 +00:00
parent c4137b6be5
commit 02a8fc8a6a
17 changed files with 499 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.dd.gdb.launch/plugin.xml
View file

@ -24,7 +24,7 @@
delegate="org.eclipse.dd.gdb.internal.provisional.launching.GdbLaunchDelegate" delegate="org.eclipse.dd.gdb.internal.provisional.launching.GdbLaunchDelegate"
id="org.eclipse.dd.gdb.launch.attachCLaunch" id="org.eclipse.dd.gdb.launch.attachCLaunch"
modes="debug" modes="debug"
name="C/C++ Attach to Local Application (Experimental - DSF)" name="C/C++ Attach to Running Application (Experimental - DSF)"
public="true" public="true"
sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator" sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer"> sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">

2
plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/AbstractCDebuggerTab.java
View file

@ -293,6 +293,8 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab {
fPageUpdated = false; fPageUpdated = false;
if (select != -1) { if (select != -1) {
fDCombo.select(select); fDCombo.select(select);
} else {
fDCombo.select(0);
} }
//The behaviour is undefined for if the callbacks should be triggered //The behaviour is undefined for if the callbacks should be triggered
// for this, // for this,

178
plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/CDebuggerTab.java
View file

@ -43,6 +43,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.dd.gdb.internal.provisional.IGDBLaunchConfigurationConstants; import org.eclipse.dd.gdb.internal.provisional.IGDBLaunchConfigurationConstants;
import org.eclipse.dd.gdb.internal.provisional.launching.LaunchMessages; import org.eclipse.dd.gdb.internal.provisional.launching.LaunchMessages;
import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.SessionType; import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.SessionType;
import org.eclipse.dd.gdb.internal.ui.GdbUIPlugin;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
@ -63,7 +64,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
public class CDebuggerTab extends AbstractCDebuggerTab { public class CDebuggerTab extends AbstractCDebuggerTab {
@ -85,6 +85,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
* *
* @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
*/ */
@Override
protected Control createDialogArea(Composite parent) { protected Control createDialogArea(Composite parent) {
Composite composite = (Composite)super.createDialogArea(parent); Composite composite = (Composite)super.createDialogArea(parent);
Group group = new Group(composite, SWT.NONE); Group group = new Group(composite, SWT.NONE);
@ -100,13 +101,14 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
return composite; return composite;
} }
@Override
protected void okPressed() { protected void okPressed() {
saveValues(); saveValues();
super.okPressed(); super.okPressed();
} }
private void initialize() { private void initialize() {
Map attr = getAdvancedAttributes(); Map<String, Boolean> attr = getAdvancedAttributes();
Object varBookkeeping = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING); Object varBookkeeping = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING);
fVarBookKeeping.setSelection( (varBookkeeping instanceof Boolean) ? !((Boolean)varBookkeeping).booleanValue() : true); fVarBookKeeping.setSelection( (varBookkeeping instanceof Boolean) ? !((Boolean)varBookkeeping).booleanValue() : true);
Object regBookkeeping = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING); Object regBookkeeping = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING);
@ -114,7 +116,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
} }
private void saveValues() { private void saveValues() {
Map attr = getAdvancedAttributes(); Map<String, Boolean> attr = getAdvancedAttributes();
Boolean varBookkeeping = Boolean.valueOf( !fVarBookKeeping.getSelection() ); Boolean varBookkeeping = Boolean.valueOf( !fVarBookKeeping.getSelection() );
attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, varBookkeeping); attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, varBookkeeping);
Boolean regBookkeeping = Boolean.valueOf( !fRegBookKeeping.getSelection() ); Boolean regBookkeeping = Boolean.valueOf( !fRegBookKeeping.getSelection() );
@ -127,28 +129,30 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
* *
* @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
*/ */
@Override
protected void configureShell(Shell newShell) { protected void configureShell(Shell newShell) {
super.configureShell(newShell); super.configureShell(newShell);
newShell.setText(LaunchMessages.getString("CDebuggerTab.Advanced_Options_Dialog_Title")); //$NON-NLS-1$ newShell.setText(LaunchMessages.getString("CDebuggerTab.Advanced_Options_Dialog_Title")); //$NON-NLS-1$
} }
} }
final protected SessionType fSessionType; protected boolean fAttachMode = false;
protected boolean fRemoteMode = false;
protected Button fAdvancedButton; protected Button fAdvancedButton;
protected Button fStopInMain; protected Button fStopInMain;
protected Text fStopInMainSymbol; protected Text fStopInMainSymbol;
protected Button fAttachButton;
private Map fAdvancedAttributes = new HashMap(5); private Map<String, Boolean> fAdvancedAttributes = new HashMap<String, Boolean>(5);
private ScrolledComposite fContainer; private ScrolledComposite fContainer;
private Composite fContents; private Composite fContents;
public CDebuggerTab(SessionType type) { public CDebuggerTab(SessionType sessionType, boolean attach) {
fSessionType = type; if (sessionType == SessionType.REMOTE) fRemoteMode = true;
fAttachMode = attach;
// If the default debugger has not been set, use the MI debugger. // If the default debugger has not been set, use the MI debugger.
// The MI plug-in also does this, but it may not have been loaded yet. Bug 158391. // The MI plug-in also does this, but it may not have been loaded yet. Bug 158391.
ICDebugConfiguration dc = CDebugCorePlugin.getDefault().getDefaultDefaultDebugConfiguration(); ICDebugConfiguration dc = CDebugCorePlugin.getDefault().getDefaultDefaultDebugConfiguration();
@ -157,6 +161,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
} }
} }
@Override
public void createControl(Composite parent) { public void createControl(Composite parent) {
fContainer = new ScrolledComposite( parent, SWT.V_SCROLL | SWT.H_SCROLL ); fContainer = new ScrolledComposite( parent, SWT.V_SCROLL | SWT.H_SCROLL );
fContainer.setLayoutData(new GridData(GridData.FILL_BOTH)); fContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
@ -166,15 +171,15 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
fContents = new Composite( fContainer, SWT.NONE ); fContents = new Composite( fContainer, SWT.NONE );
setControl(fContainer); setControl(fContainer);
/*GdbUILaunchPlugin.getDefault()*/PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), GdbUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(),
ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_DEBBUGER_TAB); ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_DEBBUGER_TAB);
int numberOfColumns = (fSessionType == SessionType.ATTACH) ? 2 : 1; int numberOfColumns = (fAttachMode) ? 2 : 1;
GridLayout layout = new GridLayout(numberOfColumns, false); GridLayout layout = new GridLayout(numberOfColumns, false);
fContents.setLayout(layout); fContents.setLayout(layout);
GridData gd = new GridData( GridData.BEGINNING, GridData.CENTER, true, false ); GridData gd = new GridData( GridData.BEGINNING, GridData.CENTER, true, false );
fContents.setLayoutData(gd); fContents.setLayoutData(gd);
createDebuggerCombo(fContents, (fSessionType == SessionType.ATTACH) ? 1 : 2 ); createDebuggerCombo(fContents, (fAttachMode) ? 1 : 2 );
createOptionsComposite(fContents); createOptionsComposite(fContents);
createDebuggerGroup(fContents, 2); createDebuggerGroup(fContents, 2);
@ -183,26 +188,18 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) { protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) {
ICDebugConfiguration[] debugConfigs; ICDebugConfiguration[] debugConfigs;
String configPlatform = getPlatform(config); // String configPlatform = getPlatform(config);
debugConfigs = CDebugCorePlugin.getDefault().getActiveDebugConfigurations(); debugConfigs = CDebugCorePlugin.getDefault().getActiveDebugConfigurations();
Arrays.sort(debugConfigs, new Comparator<ICDebugConfiguration>() { Arrays.sort(debugConfigs, new Comparator<ICDebugConfiguration>() {
public int compare(ICDebugConfiguration c1, ICDebugConfiguration c2) { public int compare(ICDebugConfiguration c1, ICDebugConfiguration c2) {
return Collator.getInstance().compare(c1.getName(), c2.getName()); return Collator.getInstance().compare(c1.getName(), c2.getName());
} }
}); });
List list = new ArrayList(); List<ICDebugConfiguration> list = new ArrayList<ICDebugConfiguration>();
String mode;
if (fSessionType == SessionType.ATTACH) {
mode = ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH;
} else if (fSessionType == SessionType.REMOTE) {
mode = IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE;
} else {
mode = ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN;
}
if (selection.equals("")) { //$NON-NLS-1$ if (selection.equals("")) { //$NON-NLS-1$
ICDebugConfiguration dc = CDebugCorePlugin.getDefault().getDefaultDebugConfiguration(); ICDebugConfiguration dc = CDebugCorePlugin.getDefault().getDefaultDebugConfiguration();
if (dc == null) { if (dc == null) {
CDebugCorePlugin.getDefault().saveDefaultDebugConfiguration("org.eclipse.cdt.debug.mi.core.CDebuggerNew"); CDebugCorePlugin.getDefault().saveDefaultDebugConfiguration("org.eclipse.cdt.debug.mi.core.CDebuggerNew");//$NON-NLS-1$
dc = CDebugCorePlugin.getDefault().getDefaultDebugConfiguration(); dc = CDebugCorePlugin.getDefault().getDefaultDebugConfiguration();
} }
if (dc != null) if (dc != null)
@ -210,47 +207,48 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
} }
String defaultSelection = selection; String defaultSelection = selection;
for (int i = 0; i < debugConfigs.length; i++) { for (int i = 0; i < debugConfigs.length; i++) {
if ((mode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE) if (((fRemoteMode || fAttachMode) && debugConfigs[i].getName().equals("gdbserver Debugger")) || //$NON-NLS-1$
&& debugConfigs[i].getName().equals("gdbserver Debugger")) || //$NON-NLS-1$ (!fRemoteMode && debugConfigs[i].getName().equals("gdb/mi"))) { //$NON-NLS-1$
(mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN) // String debuggerPlatform = debugConfigs[i].getPlatform();
&& debugConfigs[i].getName().equals("gdb/mi") && debugConfigs[i].supportsMode(mode)) || //$NON-NLS-1$ // if (validatePlatform(config, debugConfigs[i])) {
(mode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)
&& debugConfigs[i].getName().equals("gdb/mi") && debugConfigs[i].supportsMode(mode))) { //$NON-NLS-1$
String debuggerPlatform = debugConfigs[i].getPlatform();
if (validatePlatform(config, debugConfigs[i])) {
list.add(debugConfigs[i]); list.add(debugConfigs[i]);
// // select first exact matching debugger for platform or // // select first exact matching debugger for platform or
// // requested selection // // requested selection
// if ( (defaultSelection.equals("") && debuggerPlatform.equalsIgnoreCase(configPlatform))) { //$NON-NLS-1$ // if ( (defaultSelection.equals("") && debuggerPlatform.equalsIgnoreCase(configPlatform))) { //$NON-NLS-1$
// defaultSelection = debugConfigs[i].getID(); // defaultSelection = debugConfigs[i].getID();
// } // }
} // }
} }
} }
// if no selection meaning nothing in config the force initdefault on // if no selection meaning nothing in config the force initdefault on tab
// tab
setInitializeDefault(selection.equals("") ? true : false); //$NON-NLS-1$ setInitializeDefault(selection.equals("") ? true : false); //$NON-NLS-1$
loadDebuggerCombo((ICDebugConfiguration[])list.toArray(new ICDebugConfiguration[list.size()]), defaultSelection); loadDebuggerCombo(list.toArray(new ICDebugConfiguration[list.size()]), defaultSelection);
} }
@Override
protected void updateComboFromSelection() { protected void updateComboFromSelection() {
super.updateComboFromSelection(); super.updateComboFromSelection();
initializeCommonControls(getLaunchConfiguration()); initializeCommonControls(getLaunchConfiguration());
} }
@Override
public void setDefaults(ILaunchConfigurationWorkingCopy config) { public void setDefaults(ILaunchConfigurationWorkingCopy config) {
super.setDefaults(config); super.setDefaults(config);
if (fSessionType == SessionType.ATTACH) { if (fAttachMode && fRemoteMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE_ATTACH);
} else if (fAttachMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH); ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH);
} else if (fSessionType == SessionType.REMOTE) { } else if (fRemoteMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE); IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE);
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN,
ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT);
} else { } else {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN); ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
}
if (!fAttachMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN,
ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT); ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT);
} }
@ -260,7 +258,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
// Set the default debugger based on the active toolchain on the project (if possible) // Set the default debugger based on the active toolchain on the project (if possible)
String defaultDebugger = null; String defaultDebugger = null;
try { try {
String projectName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); String projectName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");//$NON-NLS-1$
if (projectName.length() > 0) { if (projectName.length() > 0) {
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project); ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project);
@ -293,6 +291,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, defaultDebugger); config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, defaultDebugger);
} }
@Override
public void initializeFrom(ILaunchConfiguration config) { public void initializeFrom(ILaunchConfiguration config) {
setInitializing(true); setInitializing(true);
super.initializeFrom(config); super.initializeFrom(config);
@ -305,43 +304,60 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
setInitializing(false); setInitializing(false);
} }
@Override
public void performApply(ILaunchConfigurationWorkingCopy config) { public void performApply(ILaunchConfigurationWorkingCopy config) {
super.performApply(config); super.performApply(config);
if (fSessionType == SessionType.ATTACH) {
if (fAttachMode && fRemoteMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE_ATTACH);
} else if (fAttachMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH); ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH);
} else if (fRemoteMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE);
} else { } else {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, fStopInMain.getSelection()); config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, fStopInMainSymbol.getText()); ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
if (fSessionType == SessionType.REMOTE) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE);
} else {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
}
} }
if (!fAttachMode) {
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN,
ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT);
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL,
fStopInMainSymbol.getText());
}
applyAdvancedAttributes(config); applyAdvancedAttributes(config);
} }
@Override
public boolean isValid(ILaunchConfiguration config) { public boolean isValid(ILaunchConfiguration config) {
if (!validateDebuggerConfig(config)) { if (!validateDebuggerConfig(config)) {
return false; return false;
} }
ICDebugConfiguration debugConfig = getDebugConfig(); ICDebugConfiguration debugConfig = getDebugConfig();
String mode = ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN; // if (fAttachMode && !debugConfig.supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
if (fSessionType == SessionType.ATTACH) mode = ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH; // setErrorMessage(MessageFormat.format(LaunchMessages.getString("CDebuggerTab.Mode_not_supported"), //$NON-NLS-1$
else if (fSessionType == SessionType.REMOTE) mode = IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE; // (Object[]) new String[]{ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH}));
// return false;
if (!mode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE) && !debugConfig.supportsMode(mode)) { // }
setErrorMessage(MessageFormat.format(LaunchMessages.getString("CDebuggerTab.Mode_not_supported"), (Object[]) new String[]{mode})); //$NON-NLS-1$ // if (fRemoteMode && !debugConfig.supportsMode(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE)) {
// setErrorMessage(MessageFormat.format(LaunchMessages.getString("CDebuggerTab.Mode_not_supported"), //$NON-NLS-1$
// (Object[]) new String[]{IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE}));
// return false;
// }
if (!fAttachMode && !fRemoteMode && !debugConfig.supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
setErrorMessage(MessageFormat.format(LaunchMessages.getString("CDebuggerTab.Mode_not_supported"), //$NON-NLS-1$
(Object[]) new String[]{ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN}));
return false; return false;
} }
if ( fStopInMain != null && fStopInMainSymbol != null ) { if ( fStopInMain != null && fStopInMainSymbol != null ) {
// The "Stop on startup at" field must not be empty // The "Stop on startup at" field must not be empty
String mainSymbol = fStopInMainSymbol.getText().trim(); String mainSymbol = fStopInMainSymbol.getText().trim();
if (fStopInMain.getSelection() && mainSymbol.length() == 0) { if (fStopInMain.getSelection() && mainSymbol.length() == 0) {
setErrorMessage( LaunchMessages.getString("CDebuggerTab.Stop_on_startup_at_can_not_be_empty")); //$NON-NLS-1$ setErrorMessage(LaunchMessages.getString("CDebuggerTab.Stop_on_startup_at_can_not_be_empty")); //$NON-NLS-1$
return false; return false;
} }
} }
@ -357,20 +373,6 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
return (debuggerPlatform.equals("*") || debuggerPlatform.equalsIgnoreCase(configPlatform)); //$NON-NLS-1$ return (debuggerPlatform.equals("*") || debuggerPlatform.equalsIgnoreCase(configPlatform)); //$NON-NLS-1$
} }
protected boolean validateCPU(ILaunchConfiguration config, ICDebugConfiguration debugConfig) {
IBinaryObject binaryFile = null;
try {
binaryFile = getBinary(config);
} catch (CoreException e) {
setErrorMessage(e.getLocalizedMessage());
}
String projectCPU = ICDebugConfiguration.CPU_NATIVE;
if (binaryFile != null) {
projectCPU = binaryFile.getCPU();
}
return debugConfig.supportsCPU(projectCPU);
}
protected IBinaryObject getBinary(ILaunchConfiguration config) throws CoreException { protected IBinaryObject getBinary(ILaunchConfiguration config) throws CoreException {
String programName = null; String programName = null;
String projectName = null; String projectName = null;
@ -436,14 +438,15 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
protected void createOptionsComposite(Composite parent) { protected void createOptionsComposite(Composite parent) {
Composite optionsComp = new Composite(parent, SWT.NONE); Composite optionsComp = new Composite(parent, SWT.NONE);
int numberOfColumns = (fSessionType == SessionType.ATTACH) ? 1 : 3; int numberOfColumns = (fAttachMode) ? 1 : 3;
GridLayout layout = new GridLayout( numberOfColumns, false ); GridLayout layout = new GridLayout( numberOfColumns, false );
optionsComp.setLayout( layout ); optionsComp.setLayout( layout );
optionsComp.setLayoutData( new GridData( GridData.BEGINNING, GridData.CENTER, true, false, 1, 1 ) ); optionsComp.setLayoutData( new GridData( GridData.BEGINNING, GridData.CENTER, true, false, 1, 1 ) );
if (fSessionType != SessionType.ATTACH) { if (!fAttachMode) {
fStopInMain = createCheckButton( optionsComp, LaunchMessages.getString( "CDebuggerTab.Stop_at_main_on_startup" ) ); //$NON-NLS-1$ fStopInMain = createCheckButton( optionsComp, LaunchMessages.getString( "CDebuggerTab.Stop_at_main_on_startup" ) ); //$NON-NLS-1$
fStopInMain.addSelectionListener(new SelectionAdapter() { fStopInMain.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
fStopInMainSymbol.setEnabled(fStopInMain.getSelection()); fStopInMainSymbol.setEnabled(fStopInMain.getSelection());
update(); update();
@ -460,6 +463,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
}); });
fStopInMainSymbol.getAccessible().addAccessibleListener( fStopInMainSymbol.getAccessible().addAccessibleListener(
new AccessibleAdapter() { new AccessibleAdapter() {
@Override
public void getName(AccessibleEvent e) { public void getName(AccessibleEvent e) {
e.result = LaunchMessages.getString( "CDebuggerTab.Stop_at_main_on_startup"); //$NON-NLS-1$ e.result = LaunchMessages.getString( "CDebuggerTab.Stop_at_main_on_startup"); //$NON-NLS-1$
} }
@ -470,6 +474,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
((GridData)fAdvancedButton.getLayoutData()).horizontalAlignment = GridData.END; ((GridData)fAdvancedButton.getLayoutData()).horizontalAlignment = GridData.END;
fAdvancedButton.addSelectionListener(new SelectionAdapter() { fAdvancedButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
Dialog dialog = new AdvancedDebuggerOptionsDialog(getShell()); Dialog dialog = new AdvancedDebuggerOptionsDialog(getShell());
dialog.open(); dialog.open();
@ -477,32 +482,30 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
}); });
} }
protected Map getAdvancedAttributes() { protected Map<String, Boolean> getAdvancedAttributes() {
return fAdvancedAttributes; return fAdvancedAttributes;
} }
private void initializeAdvancedAttributes(ILaunchConfiguration config) { private void initializeAdvancedAttributes(ILaunchConfiguration config) {
Map attr = getAdvancedAttributes(); Map<String, Boolean> attr = getAdvancedAttributes();
try { try {
Boolean varBookkeeping = (config.getAttribute( boolean varBookkeeping = (config.getAttribute(
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, false)) ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, false))
? Boolean.TRUE ? true : false;
: Boolean.FALSE;
attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, varBookkeeping); attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, varBookkeeping);
} catch (CoreException e) { } catch (CoreException e) {
} }
try { try {
Boolean regBookkeeping = (config.getAttribute( Boolean regBookkeeping = (config.getAttribute(
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, false)) ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, false))
? Boolean.TRUE ? true :false;
: Boolean.FALSE;
attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, regBookkeeping); attr.put(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING, regBookkeeping);
} catch (CoreException e) { } catch (CoreException e) {
} }
} }
private void applyAdvancedAttributes(ILaunchConfigurationWorkingCopy config) { private void applyAdvancedAttributes(ILaunchConfigurationWorkingCopy config) {
Map attr = getAdvancedAttributes(); Map<String, Boolean> attr = getAdvancedAttributes();
Object varBookkeeping = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING); Object varBookkeeping = attr.get(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING);
if (varBookkeeping instanceof Boolean) if (varBookkeeping instanceof Boolean)
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING,
@ -513,6 +516,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
((Boolean)regBookkeeping).booleanValue()); ((Boolean)regBookkeeping).booleanValue());
} }
@Override
protected Shell getShell() { protected Shell getShell() {
return super.getShell(); return super.getShell();
} }
@ -522,6 +526,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
* *
* @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose() * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
*/ */
@Override
public void dispose() { public void dispose() {
getAdvancedAttributes().clear(); getAdvancedAttributes().clear();
ICDebuggerPage debuggerPage = getDynamicTab(); ICDebuggerPage debuggerPage = getDynamicTab();
@ -532,22 +537,29 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
protected void initializeCommonControls(ILaunchConfiguration config) { protected void initializeCommonControls(ILaunchConfiguration config) {
try { try {
if (fSessionType != SessionType.ATTACH) { if (!fAttachMode) {
fStopInMain.setSelection(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, fStopInMain.setSelection(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN,
ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT)); ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT));
fStopInMainSymbol.setText(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, fStopInMainSymbol.setText(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL,
ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT)); ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT));
fStopInMainSymbol.setEnabled(fStopInMain.getSelection()); fStopInMainSymbol.setEnabled(fStopInMain.getSelection());
} else {
// In attach mode, figure out if we are doing a remote connect based on the currently
// chosen debugger
if (getDebugConfig().getName().equals("gdbserver Debugger")) fRemoteMode = true; //$NON-NLS-1$
else fRemoteMode = false;
} }
initializeAdvancedAttributes(config); initializeAdvancedAttributes(config);
} catch (CoreException e) { } catch (CoreException e) {
} }
} }
@Override
protected void setInitializeDefault(boolean init) { protected void setInitializeDefault(boolean init) {
super.setInitializeDefault(init); super.setInitializeDefault(init);
} }
@Override
protected void contentsChanged() { protected void contentsChanged() {
fContainer.setMinSize(fContents.computeSize(SWT.DEFAULT, SWT.DEFAULT)); fContainer.setMinSize(fContents.computeSize(SWT.DEFAULT, SWT.DEFAULT));
} }

4
plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/GdbAttachLaunchConfigurationTabGroup.java
View file

@ -10,7 +10,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dd.gdb.internal.ui.launching; package org.eclipse.dd.gdb.internal.ui.launching;
import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.SessionType;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
import org.eclipse.debug.ui.CommonTab; import org.eclipse.debug.ui.CommonTab;
import org.eclipse.debug.ui.ILaunchConfigurationDialog; import org.eclipse.debug.ui.ILaunchConfigurationDialog;
@ -26,7 +25,8 @@ public class GdbAttachLaunchConfigurationTabGroup extends AbstractLaunchConfigur
public void createTabs(ILaunchConfigurationDialog dialog, String mode) { public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new CMainTab(), new CMainTab(),
new CDebuggerTab(SessionType.ATTACH), // We don't know yet if we are going to do a remote or local session
new CDebuggerTab(null, true),
new SourceLookupTab(), new SourceLookupTab(),
new CommonTab() new CommonTab()
}; };

2
plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/GdbLocalRunLaunchConfigurationTabGroup.java
View file

@ -26,7 +26,7 @@ public class GdbLocalRunLaunchConfigurationTabGroup extends AbstractLaunchConfig
public void createTabs(ILaunchConfigurationDialog dialog, String mode) { public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new CMainTab(), new CMainTab(),
new CDebuggerTab(SessionType.RUN), new CDebuggerTab(SessionType.LOCAL, false),
new SourceLookupTab(), new SourceLookupTab(),
new CommonTab() new CommonTab()
}; };

2
plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/GdbRemoteRunLaunchConfigurationTabGroup.java
View file

@ -26,7 +26,7 @@ public class GdbRemoteRunLaunchConfigurationTabGroup extends AbstractLaunchConfi
public void createTabs(ILaunchConfigurationDialog dialog, String mode) { public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
new CMainTab(), new CMainTab(),
new CDebuggerTab(SessionType.REMOTE), new CDebuggerTab(SessionType.REMOTE, false),
new SourceLookupTab(), new SourceLookupTab(),
new CommonTab() new CommonTab()
}; };

127
plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/ProcessPrompter.java
View file

@ -11,18 +11,18 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dd.gdb.internal.ui.launching; package org.eclipse.dd.gdb.internal.ui.launching;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.IProcessInfo; import org.eclipse.cdt.core.IProcessInfo;
import org.eclipse.cdt.core.IProcessList;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.dd.gdb.internal.provisional.launching.FinalLaunchSequence;
import org.eclipse.dd.gdb.internal.provisional.launching.LaunchMessages; import org.eclipse.dd.gdb.internal.provisional.launching.LaunchMessages;
import org.eclipse.dd.gdb.internal.ui.GdbUIPlugin; import org.eclipse.dd.gdb.internal.ui.GdbUIPlugin;
import org.eclipse.debug.core.IStatusHandler; import org.eclipse.debug.core.IStatusHandler;
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
@ -48,64 +48,83 @@ public class ProcessPrompter implements IStatusHandler {
throw new CoreException(error); throw new CoreException(error);
} }
ILabelProvider provider = new LabelProvider() { // Get the process list from the FinalLaunchSequence
IProcessInfo[] plist = ((FinalLaunchSequence)source).getProcessList();
/*
* (non-Javadoc)
*
* @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
*/
public String getText(Object element) {
IProcessInfo info = (IProcessInfo)element;
IPath path = new Path(info.getName());
return path.lastSegment() + " - " + info.getPid(); //$NON-NLS-1$
}
/*
* (non-Javadoc)
*
* @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
*/
public Image getImage(Object element) {
return LaunchImages.get(LaunchImages.IMG_OBJS_EXEC);
}
};
ILabelProvider qprovider = new LabelProvider() {
public String getText(Object element) {
IProcessInfo info = (IProcessInfo)element;
return info.getName();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
*/
public Image getImage(Object element) {
return LaunchImages.get(LaunchImages.IMG_OBJS_EXEC);
}
};
TwoPaneElementSelector dialog = new TwoPaneElementSelector(shell, provider, qprovider);
dialog.setTitle(LaunchMessages.getString("LocalAttachLaunchDelegate.Select_Process")); //$NON-NLS-1$
dialog.setMessage(LaunchMessages.getString("LocalAttachLaunchDelegate.Select_Process_to_attach_debugger_to")); //$NON-NLS-1$
IProcessList plist = null;
try {
plist = CCorePlugin.getDefault().getProcessList();
} catch (CoreException e) {
GdbUIPlugin.errorDialog(LaunchMessages.getString("LocalAttachLaunchDelegate.CDT_Launch_Error"), e.getStatus()); //$NON-NLS-1$
}
if (plist == null) { if (plist == null) {
MessageDialog.openError( MessageDialog.openError(
shell, shell,
LaunchMessages.getString("LocalAttachLaunchDelegate.CDT_Launch_Error"), LaunchMessages.getString("LocalAttachLaunchDelegate.Platform_cannot_list_processes")); //$NON-NLS-1$ //$NON-NLS-2$ LaunchMessages.getString("LocalAttachLaunchDelegate.CDT_Launch_Error"), LaunchMessages.getString("LocalAttachLaunchDelegate.Platform_cannot_list_processes")); //$NON-NLS-1$ //$NON-NLS-2$
return null; return null;
} }
dialog.setElements(plist.getProcessList());
if (dialog.open() == Window.OK) { if (plist.length == 0) {
IProcessInfo info = (IProcessInfo)dialog.getFirstResult(); // No list available, just let the user put in a pid directly
if (info != null) { InputDialog dialog = new InputDialog(shell,
return new Integer(info.getPid()); LaunchMessages.getString("LocalAttachLaunchDelegate.Select_Process"), //$NON-NLS-1$
LaunchMessages.getString("LocalAttachLaunchDelegate.Select_Process_to_attach_debugger_to"), //$NON-NLS-1$
null, null);
if (dialog.open() == Window.OK) {
String pidStr = dialog.getValue();
try {
return Integer.parseInt(pidStr);
} catch (NumberFormatException e) {
}
}
} else {
ILabelProvider provider = new LabelProvider() {
/*
* (non-Javadoc)
*
* @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
*/
@Override
public String getText(Object element) {
IProcessInfo info = (IProcessInfo)element;
IPath path = new Path(info.getName());
return path.lastSegment() + " - " + info.getPid(); //$NON-NLS-1$
}
/*
* (non-Javadoc)
*
* @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
*/
@Override
public Image getImage(Object element) {
return LaunchImages.get(LaunchImages.IMG_OBJS_EXEC);
}
};
ILabelProvider qprovider = new LabelProvider() {
@Override
public String getText(Object element) {
IProcessInfo info = (IProcessInfo)element;
return info.getName();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
*/
@Override
public Image getImage(Object element) {
return LaunchImages.get(LaunchImages.IMG_OBJS_EXEC);
}
};
// Display the list of processes and have the user choose
TwoPaneElementSelector dialog = new TwoPaneElementSelector(shell, provider, qprovider);
dialog.setTitle(LaunchMessages.getString("LocalAttachLaunchDelegate.Select_Process")); //$NON-NLS-1$
dialog.setMessage(LaunchMessages.getString("LocalAttachLaunchDelegate.Select_Process_to_attach_debugger_to")); //$NON-NLS-1$
dialog.setElements(plist);
if (dialog.open() == Window.OK) {
IProcessInfo info = (IProcessInfo)dialog.getFirstResult();
if (info != null) {
return new Integer(info.getPid());
}
} }
} }
return null; return null;
} }

1
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/IGDBLaunchConfigurationConstants.java
View file

@ -13,5 +13,6 @@ package org.eclipse.dd.gdb.internal.provisional;
public class IGDBLaunchConfigurationConstants { public class IGDBLaunchConfigurationConstants {
public static final String DEBUGGER_MODE_REMOTE = "remote"; //$NON-NLS-1$ public static final String DEBUGGER_MODE_REMOTE = "remote"; //$NON-NLS-1$
public static final String DEBUGGER_MODE_REMOTE_ATTACH = "remote_attach"; //$NON-NLS-1$
} }

138
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/FinalLaunchSequence.java
View file

@ -13,13 +13,19 @@ package org.eclipse.dd.gdb.internal.provisional.launching;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.IProcessInfo;
import org.eclipse.cdt.core.IProcessList;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector; import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
import org.eclipse.cdt.debug.mi.core.IGDBServerMILaunchConfigurationConstants; import org.eclipse.cdt.debug.mi.core.IGDBServerMILaunchConfigurationConstants;
import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants; import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.dd.dsf.concurrent.DataRequestMonitor; import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
import org.eclipse.dd.dsf.concurrent.DsfExecutor; import org.eclipse.dd.dsf.concurrent.DsfExecutor;
import org.eclipse.dd.dsf.concurrent.RequestMonitor; import org.eclipse.dd.dsf.concurrent.RequestMonitor;
@ -31,12 +37,17 @@ import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.Sessio
import org.eclipse.dd.mi.service.CSourceLookup; import org.eclipse.dd.mi.service.CSourceLookup;
import org.eclipse.dd.mi.service.MIBreakpointsManager; import org.eclipse.dd.mi.service.MIBreakpointsManager;
import org.eclipse.dd.mi.service.command.commands.CLIAttach; import org.eclipse.dd.mi.service.command.commands.CLIAttach;
import org.eclipse.dd.mi.service.command.commands.CLIMonitorListProcesses;
import org.eclipse.dd.mi.service.command.commands.CLISource; import org.eclipse.dd.mi.service.command.commands.CLISource;
import org.eclipse.dd.mi.service.command.commands.MIFileExecAndSymbols; import org.eclipse.dd.mi.service.command.commands.MIFileExecAndSymbols;
import org.eclipse.dd.mi.service.command.commands.MIGDBSetAutoSolib; import org.eclipse.dd.mi.service.command.commands.MIGDBSetAutoSolib;
import org.eclipse.dd.mi.service.command.commands.MIGDBSetSolibSearchPath; import org.eclipse.dd.mi.service.command.commands.MIGDBSetSolibSearchPath;
import org.eclipse.dd.mi.service.command.commands.MITargetSelect; import org.eclipse.dd.mi.service.command.commands.MITargetSelect;
import org.eclipse.dd.mi.service.command.output.CLIMonitorListProcessesInfo;
import org.eclipse.dd.mi.service.command.output.MIInfo; import org.eclipse.dd.mi.service.command.output.MIInfo;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.IStatusHandler;
public class FinalLaunchSequence extends Sequence { public class FinalLaunchSequence extends Sequence {
@ -155,7 +166,6 @@ public class FinalLaunchSequence extends Sequence {
}}, }},
/* /*
* If remote debugging, connect to target. * If remote debugging, connect to target.
* If attach session, perform the attach.
*/ */
new Step() { new Step() {
private boolean fTcpConnection; private boolean fTcpConnection;
@ -233,15 +243,113 @@ public class FinalLaunchSequence extends Sequence {
fSerialDevice), fSerialDevice),
new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor)); new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
} }
} else if (fSessionType == SessionType.ATTACH) {
fCommandControl.queueCommand(
new CLIAttach(fCommandControl.getControlDMContext(), fPid),
new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
} else { } else {
requestMonitor.done(); requestMonitor.done();
} }
} }
}, },
/*
* If attach session, perform the attach.
*/
new Step() {
private void promptForProcessID(final ILaunchConfiguration config, final DataRequestMonitor<Integer> rm) {
IStatus promptStatus = new Status(IStatus.INFO, "org.eclipse.debug.ui", 200/*STATUS_HANDLER_PROMPT*/, "", null); //$NON-NLS-1$//$NON-NLS-2$
final IStatus processPromptStatus = new Status(IStatus.INFO, "org.eclipse.dd.gdb.ui", 100, "", null); //$NON-NLS-1$//$NON-NLS-2$
final IStatusHandler prompter = DebugPlugin.getDefault().getStatusHandler(promptStatus);
final Status noPidStatus = new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, -1,
LaunchMessages.getString("LocalAttachLaunchDelegate.No_Process_ID_selected"), //$NON-NLS-1$
null);
if (prompter == null) {
rm.setStatus(noPidStatus);
rm.done();
return;
}
// Need a job because prompter.handleStatus will block
final Job promptForPid = new Job("Prompt for Process") { //$NON-NLS-1$
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
Object result = prompter.handleStatus(processPromptStatus, FinalLaunchSequence.this);
if (result instanceof Integer) {
rm.setData((Integer)result);
} else {
rm.setStatus(noPidStatus);
}
} catch (CoreException e) {
rm.setStatus(noPidStatus);
}
rm.done();
return Status.OK_STATUS;
}
};
if (fSessionType == SessionType.LOCAL) {
try {
IProcessList list = CCorePlugin.getDefault().getProcessList();
if (list != null) fProcessList = list.getProcessList();
} catch (CoreException e) {
} finally {
// If the list is null, the prompter will deal with it
promptForPid.schedule();
}
} else {
fCommandControl.queueCommand(
new CLIMonitorListProcesses(fCommandControl.getControlDMContext()),
new DataRequestMonitor<CLIMonitorListProcessesInfo>(getExecutor(), rm) {
@Override
protected void handleCompleted() {
if (isSuccess()) {
fProcessList = getData().getProcessList();
} else {
// The monitor list command is not supported.
// Just set the list to empty and let the user
// put in the pid directly.
fProcessList = new IProcessInfo[0];
}
promptForPid.schedule();
}
});
}
}
@Override
public void execute(final RequestMonitor requestMonitor) {
if (fAttach) {
// If we are attaching, get the process id.
int pid = -1;
try {
// have we already been given the pid (maybe from a JUnit test launch or something)
pid = fLaunch.getLaunchConfiguration().getAttribute(ICDTLaunchConfigurationConstants.ATTR_ATTACH_PROCESS_ID, -1);
} catch (CoreException e) {
// do nothing and fall to below
}
if (pid != -1) {
fCommandControl.queueCommand(
new CLIAttach(fCommandControl.getControlDMContext(), pid),
new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
} else {
promptForProcessID(fLaunch.getLaunchConfiguration(),
new DataRequestMonitor<Integer>(getExecutor(), requestMonitor) {
@Override
protected void handleSuccess() {
fCommandControl.queueCommand(
new CLIAttach(fCommandControl.getControlDMContext(), getData()),
new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
}
});
}
} else {
requestMonitor.done();
}
}
},
/* /*
* Start tracking the breakpoints once we know we are connected to the target (necessary for remote debugging) * Start tracking the breakpoints once we know we are connected to the target (necessary for remote debugging)
*/ */
@ -265,27 +373,25 @@ public class FinalLaunchSequence extends Sequence {
GdbLaunch fLaunch; GdbLaunch fLaunch;
SessionType fSessionType; SessionType fSessionType;
int fPid; boolean fAttach;
GDBControl fCommandControl; GDBControl fCommandControl;
// The list of processes used in the case of an ATTACH session
public FinalLaunchSequence(DsfExecutor executor, GdbLaunch launch, SessionType type) { IProcessInfo[] fProcessList = null;
public FinalLaunchSequence(DsfExecutor executor, GdbLaunch launch, SessionType sessionType, boolean attach) {
super(executor); super(executor);
fLaunch = launch; fLaunch = launch;
fSessionType = type; fSessionType = sessionType;
fAttach = attach;
} }
// If a pid is specified, it is for an ATTACH type
public FinalLaunchSequence(DsfExecutor executor, GdbLaunch launch, int attachToPid) {
this(executor, launch, SessionType.ATTACH);
fPid = attachToPid;
}
@Override @Override
public Step[] getSteps() { public Step[] getSteps() {
return fSteps; return fSteps;
} }
public IProcessInfo[] getProcessList() { return fProcessList; }
} }

77
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/GdbLaunchDelegate.java
View file

@ -46,7 +46,6 @@ import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.IStatusHandler;
import org.eclipse.debug.core.model.ILaunchConfigurationDelegate2; import org.eclipse.debug.core.model.ILaunchConfigurationDelegate2;
import org.eclipse.debug.core.model.IPersistableSourceLocator; import org.eclipse.debug.core.model.IPersistableSourceLocator;
import org.eclipse.debug.core.model.ISourceLocator; import org.eclipse.debug.core.model.ISourceLocator;
@ -92,6 +91,8 @@ public class GdbLaunchDelegate extends LaunchConfigurationDelegate
} }
SessionType sessionType = getSessionType(config); SessionType sessionType = getSessionType(config);
boolean attach = getIsAttach(config);
final GdbLaunch launch = (GdbLaunch)l; final GdbLaunch launch = (GdbLaunch)l;
if (sessionType == SessionType.REMOTE) { if (sessionType == SessionType.REMOTE) {
@ -109,29 +110,9 @@ public class GdbLaunchDelegate extends LaunchConfigurationDelegate
monitor.worked( 1 ); monitor.worked( 1 );
// If we are attaching, get the process id now, so as to avoid starting the launch
// and canceling it if the user does not put the pid properly.
int pid = -1;
if (sessionType == SessionType.ATTACH) {
try {
// have we already been given the pid (maybe from a JUnit test launch or something)
pid = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_ATTACH_PROCESS_ID, -1);
} catch (CoreException e) {
// do nothing and fall to below
}
if (pid == -1) {
pid = promptForProcessID(config);
}
if (pid == -1) {
throw new DebugException(new Status(IStatus.CANCEL, GdbPlugin.PLUGIN_ID,
LaunchMessages.getString("LocalAttachLaunchDelegate.No_Process_ID_selected"))); //$NON-NLS-1$
}
}
// Create and invoke the launch sequence to create the debug control and services // Create and invoke the launch sequence to create the debug control and services
final ServicesLaunchSequence servicesLaunchSequence = final ServicesLaunchSequence servicesLaunchSequence =
new ServicesLaunchSequence(launch.getSession(), launch, exePath); new ServicesLaunchSequence(launch.getSession(), launch, exePath, sessionType, attach);
launch.getSession().getExecutor().execute(servicesLaunchSequence); launch.getSession().getExecutor().execute(servicesLaunchSequence);
try { try {
servicesLaunchSequence.get(); servicesLaunchSequence.get();
@ -151,12 +132,8 @@ public class GdbLaunchDelegate extends LaunchConfigurationDelegate
launch.addInferiorProcess(exePath.lastSegment()); launch.addInferiorProcess(exePath.lastSegment());
// Create and invoke the final launch sequence to setup GDB // Create and invoke the final launch sequence to setup GDB
final FinalLaunchSequence finalLaunchSequence; final FinalLaunchSequence finalLaunchSequence =
if (sessionType == SessionType.ATTACH) { new FinalLaunchSequence(launch.getSession().getExecutor(), launch, sessionType, attach);
finalLaunchSequence = new FinalLaunchSequence(launch.getSession().getExecutor(), launch, pid);
} else {
finalLaunchSequence = new FinalLaunchSequence(launch.getSession().getExecutor(), launch, sessionType);
}
launch.getSession().getExecutor().execute(finalLaunchSequence); launch.getSession().getExecutor().execute(finalLaunchSequence);
try { try {
finalLaunchSequence.get(); finalLaunchSequence.get();
@ -167,36 +144,44 @@ public class GdbLaunchDelegate extends LaunchConfigurationDelegate
} }
} }
private SessionType getSessionType(ILaunchConfiguration config) { private SessionType getSessionType(ILaunchConfiguration config) {
try { try {
String debugMode = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN ); String debugMode = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN );
if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) { if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
return SessionType.RUN; return SessionType.LOCAL;
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) { } else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
return SessionType.ATTACH; return SessionType.LOCAL;
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE)) { } else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE)) {
return SessionType.CORE; return SessionType.CORE;
} else if (debugMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE)) { } else if (debugMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE)) {
return SessionType.REMOTE; return SessionType.REMOTE;
} } else if (debugMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE_ATTACH)) {
return SessionType.REMOTE;
}
} catch (CoreException e) { } catch (CoreException e) {
} }
return SessionType.RUN; return SessionType.LOCAL;
}
private boolean getIsAttach(ILaunchConfiguration config) {
try {
String debugMode = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN );
if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
return false;
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
return true;
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE)) {
return false;
} else if (debugMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE)) {
return false;
} else if (debugMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE_ATTACH)) {
return true;
}
} catch (CoreException e) {
}
return false;
} }
protected int promptForProcessID(ILaunchConfiguration config) throws CoreException {
IStatus fPromptStatus = new Status(IStatus.INFO, "org.eclipse.debug.ui", 200, "", null); //$NON-NLS-1$//$NON-NLS-2$
IStatus processPrompt = new Status(IStatus.INFO, "org.eclipse.dd.gdb.ui", 100, "", null); //$NON-NLS-1$//$NON-NLS-2$
// consult a status handler
IStatusHandler prompter = DebugPlugin.getDefault().getStatusHandler(fPromptStatus);
if (prompter != null) {
Object result = prompter.handleStatus(processPrompt, config);
if (result instanceof Integer) {
return ((Integer)result).intValue();
}
}
return -1;
}
@Override @Override
public boolean preLaunchCheck(ILaunchConfiguration config, String mode, IProgressMonitor monitor) throws CoreException { public boolean preLaunchCheck(ILaunchConfiguration config, String mode, IProgressMonitor monitor) throws CoreException {

2
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/LaunchMessages.properties
View file

@ -38,7 +38,7 @@ LocalAttachLaunchDelegate.Attaching_to_Local_C_Application=Attaching to Local C/
LocalAttachLaunchDelegate.No_Process_ID_selected=No Process ID selected LocalAttachLaunchDelegate.No_Process_ID_selected=No Process ID selected
LocalAttachLaunchDelegate.Select_Process=Select Process LocalAttachLaunchDelegate.Select_Process=Select Process
LocalAttachLaunchDelegate.Platform_cannot_list_processes=Current platform does not support listing processes LocalAttachLaunchDelegate.Platform_cannot_list_processes=Current platform does not support listing processes
LocalAttachLaunchDelegate.Select_Process_to_attach_debugger_to=Select a Process to attach debugger to: LocalAttachLaunchDelegate.Select_Process_to_attach_debugger_to=Select a Process to attach the debugger to:
LocalAttachLaunchDelegate.CDT_Launch_Error=CDT Launch Error LocalAttachLaunchDelegate.CDT_Launch_Error=CDT Launch Error
CoreFileLaunchDelegate.Launching_postmortem_debugger=Launching postmortem debugger CoreFileLaunchDelegate.Launching_postmortem_debugger=Launching postmortem debugger

29
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/launching/ServicesLaunchSequence.java
View file

@ -11,7 +11,6 @@
package org.eclipse.dd.gdb.internal.provisional.launching; package org.eclipse.dd.gdb.internal.provisional.launching;
import org.eclipse.cdt.debug.core.CDebugCorePlugin; import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector; import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants; import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -21,7 +20,6 @@ import org.eclipse.dd.dsf.concurrent.RequestMonitor;
import org.eclipse.dd.dsf.concurrent.Sequence; import org.eclipse.dd.dsf.concurrent.Sequence;
import org.eclipse.dd.dsf.debug.service.StepQueueManager; import org.eclipse.dd.dsf.debug.service.StepQueueManager;
import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.dsf.service.DsfSession;
import org.eclipse.dd.gdb.internal.provisional.IGDBLaunchConfigurationConstants;
import org.eclipse.dd.gdb.internal.provisional.service.GDBRunControl; import org.eclipse.dd.gdb.internal.provisional.service.GDBRunControl;
import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl; import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl;
import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.SessionType; import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.SessionType;
@ -42,29 +40,10 @@ public class ServicesLaunchSequence extends Sequence {
new Step() { new Step() {
@Override @Override
public void execute(RequestMonitor requestMonitor) { public void execute(RequestMonitor requestMonitor) {
String debugMode = ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN;
try {
debugMode = fLaunch.getLaunchConfiguration().getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN );
} catch (CoreException e) {
}
if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
fSessionType = SessionType.RUN;
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
fSessionType = SessionType.ATTACH;
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE)) {
fSessionType = SessionType.CORE;
} else if (debugMode.equals(IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE)) {
fSessionType = SessionType.REMOTE;
} else {
fSessionType = SessionType.RUN;
}
// //
// Create the connection. // Create the connection.
// //
fCommandControl = new GDBControl(fSession, getGDBPath(), fExecPath, fSessionType, 30); fCommandControl = new GDBControl(fSession, getGDBPath(), fExecPath, fSessionType, fAttach, 30);
fCommandControl.initialize(requestMonitor); fCommandControl.initialize(requestMonitor);
} }
}, },
@ -128,17 +107,21 @@ public class ServicesLaunchSequence extends Sequence {
DsfSession fSession; DsfSession fSession;
GdbLaunch fLaunch; GdbLaunch fLaunch;
IPath fExecPath; IPath fExecPath;
SessionType fSessionType; SessionType fSessionType;
boolean fAttach;
GDBControl fCommandControl; GDBControl fCommandControl;
CSourceLookup fSourceLookup; CSourceLookup fSourceLookup;
MIBreakpointsManager fBpmService; MIBreakpointsManager fBpmService;
public ServicesLaunchSequence(DsfSession session, GdbLaunch launch, IPath execPath) { public ServicesLaunchSequence(DsfSession session, GdbLaunch launch, IPath execPath, SessionType sessionType, boolean attach) {
super(session.getExecutor()); super(session.getExecutor());
fSession = session; fSession = session;
fLaunch = launch; fLaunch = launch;
fExecPath = execPath; fExecPath = execPath;
fSessionType = sessionType;
fAttach = attach;
} }
@Override @Override

20
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java
View file

@ -92,9 +92,11 @@ public class GDBControl extends AbstractMIControl {
private static int fgInstanceCounter = 0; private static int fgInstanceCounter = 0;
private final GDBControlDMContext fControlDmc; private final GDBControlDMContext fControlDmc;
public enum SessionType { RUN, ATTACH, CORE, REMOTE } public enum SessionType { LOCAL, REMOTE, CORE }
private SessionType fSessionType; private SessionType fSessionType;
public boolean fAttach;
private boolean fConnected = false; private boolean fConnected = false;
private MonitorJob fMonitorJob; private MonitorJob fMonitorJob;
@ -111,9 +113,10 @@ public class GDBControl extends AbstractMIControl {
private PTY fPty; private PTY fPty;
public GDBControl(DsfSession session, IPath gdbPath, IPath execPath, SessionType type, int gdbLaunchTimeout) { public GDBControl(DsfSession session, IPath gdbPath, IPath execPath, SessionType sessionType, boolean attach, int gdbLaunchTimeout) {
super(session); super(session);
fSessionType = type; fSessionType = sessionType;
fAttach = attach;
fGdbPath = gdbPath; fGdbPath = gdbPath;
fExecPath = execPath; fExecPath = execPath;
fGDBLaunchTimeout = gdbLaunchTimeout; fGDBLaunchTimeout = gdbLaunchTimeout;
@ -184,6 +187,9 @@ public class GDBControl extends AbstractMIControl {
return fSessionType; return fSessionType;
} }
public boolean getIsAttachSession() {
return fAttach;
}
public boolean canInterrupt() { public boolean canInterrupt() {
return fProcess instanceof Spawner; return fProcess instanceof Spawner;
} }
@ -241,11 +247,11 @@ public class GDBControl extends AbstractMIControl {
/* /*
* This method does the necessary work to setup the input/output streams for the * This method does the necessary work to setup the input/output streams for the
* inferior process, by either preparing the PTY to be used, to simply leaving * inferior process, by either preparing the PTY to be used, to simply leaving
* the PTY null, which indicates that the input/output streams of the CLI shoud * the PTY null, which indicates that the input/output streams of the CLI should
* be used instead; this decision is based on the type of session. * be used instead; this decision is based on the type of session.
*/ */
public void initInferiorInputOutput(final RequestMonitor requestMonitor) { public void initInferiorInputOutput(final RequestMonitor requestMonitor) {
if (fSessionType == SessionType.ATTACH || fSessionType == SessionType.REMOTE) { if (fSessionType == SessionType.REMOTE || fAttach) {
// These types do not use a PTY // These types do not use a PTY
fPty = null; fPty = null;
requestMonitor.done(); requestMonitor.done();
@ -275,7 +281,7 @@ public class GDBControl extends AbstractMIControl {
public boolean canRestart() { public boolean canRestart() {
if (fSessionType == SessionType.ATTACH) return false; if (fAttach) return false;
// Before GDB6.8, the Linux gdbserver would restart a new // Before GDB6.8, the Linux gdbserver would restart a new
// process when getting a -exec-run but the communication // process when getting a -exec-run but the communication
@ -307,7 +313,7 @@ public class GDBControl extends AbstractMIControl {
* Insert breakpoint at entry if set, and start or restart the program. * Insert breakpoint at entry if set, and start or restart the program.
*/ */
protected void startOrRestart(final GdbLaunch launch, boolean restart, final RequestMonitor requestMonitor) { protected void startOrRestart(final GdbLaunch launch, boolean restart, final RequestMonitor requestMonitor) {
if (fSessionType == SessionType.ATTACH) { if (fAttach) {
// When attaching to a running process, we do not need to set a breakpoint or // When attaching to a running process, we do not need to set a breakpoint or
// start the program; it is left up to the user. // start the program; it is left up to the user.
requestMonitor.done(); requestMonitor.done();

10
plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBInferiorProcess.java
View file

@ -17,7 +17,6 @@ import java.util.concurrent.RejectedExecutionException;
import org.eclipse.cdt.utils.pty.PTY; import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.dd.dsf.concurrent.DsfRunnable; import org.eclipse.dd.dsf.concurrent.DsfRunnable;
import org.eclipse.dd.dsf.concurrent.ThreadSafeAndProhibitedFromDsfExecutor; import org.eclipse.dd.dsf.concurrent.ThreadSafeAndProhibitedFromDsfExecutor;
import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl.SessionType;
import org.eclipse.dd.mi.service.command.MIInferiorProcess; import org.eclipse.dd.mi.service.command.MIInferiorProcess;
/** /**
@ -46,15 +45,12 @@ class GDBInferiorProcess extends MIInferiorProcess {
// An inferior will be destroy():interrupt and kill if // An inferior will be destroy():interrupt and kill if
// - For attach session: // - For attach session:
// the inferior was not disconnected yet (no need to try // never (we don't kill an independent process.)
// to kill a disconnected program).
// - For Program session: // - For Program session:
// if the inferior was not terminated. // if the inferior is still running.
// - For PostMortem(Core): send event // - For PostMortem(Core): send event
// else noop // else noop
if ((gdb.getSessionType() == SessionType.ATTACH && gdb.isConnected()) || if (gdb.getIsAttachSession() == false) {
(gdb.getSessionType() == SessionType.RUN && getState() != State.TERMINATED))
{
// Try to interrupt the inferior, first. // Try to interrupt the inferior, first.
if (getState() == State.RUNNING) { if (getState() == State.RUNNING) {
gdb.interrupt(); gdb.interrupt();

46
plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIMonitorListProcesses.java Normal file
View file

@ -0,0 +1,46 @@
/*******************************************************************************
* Copyright (c) 2008 Ericsson and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Ericsson - Initial API and implementation
*******************************************************************************/
package org.eclipse.dd.mi.service.command.commands;
import org.eclipse.dd.dsf.datamodel.IDMContext;
import org.eclipse.dd.mi.service.command.output.CLIMonitorListProcessesInfo;
import org.eclipse.dd.mi.service.command.output.MIInfo;
import org.eclipse.dd.mi.service.command.output.MIOutput;
/**
*
* monitor list processes
*
* This command is not available in the current version of GDBServer. However it should
* be available in the future.
*
*/
public class CLIMonitorListProcesses extends CLICommand<CLIMonitorListProcessesInfo>
{
public CLIMonitorListProcesses(IDMContext ctx) {
super(ctx, "monitor list processes"); //$NON-NLS-1$
}
@Override
public CLIMonitorListProcessesInfo getResult(MIOutput output) {
return (CLIMonitorListProcessesInfo)getMIInfo(output);
}
public MIInfo getMIInfo(MIOutput out) {
MIInfo info = null;
if (out != null) {
info = new CLIMonitorListProcessesInfo(out);
}
return info;
}
}

99
plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/output/CLIMonitorListProcessesInfo.java Normal file
View file

@ -0,0 +1,99 @@
/*******************************************************************************
* Copyright (c) 2008 Ericsson and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Ericsson - Initial API and implementation
*******************************************************************************/
package org.eclipse.dd.mi.service.command.output;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.cdt.core.IProcessInfo;
/**
*
* @" 26 N 0 N 32794 Idle 2 Http daemon\n"
*/
public class CLIMonitorListProcessesInfo extends MIInfo {
public class ProcessInfo implements IProcessInfo, Comparable<ProcessInfo> {
int pid;
String name;
public ProcessInfo(String pidString, String name) {
try {
pid = Integer.parseInt(pidString);
} catch (NumberFormatException e) {
}
this.name = name;
}
public ProcessInfo(int pid, String name) {
this.pid = pid;
this.name = name;
}
/**
* @see org.eclipse.cdt.core.IProcessInfo#getName()
*/
public String getName() {
return name;
}
/**
* @see org.eclipse.cdt.core.IProcessInfo#getPid()
*/
public int getPid() {
return pid;
}
public int compareTo(ProcessInfo other) {
int nameCompare = getName().compareTo(other.getName());
if (nameCompare != 0) return nameCompare;
else return (getPid() < other.getPid()) ? -1 : 1;
}
}
IProcessInfo[] fProcessList;
public CLIMonitorListProcessesInfo(MIOutput out) {
super(out);
parse();
}
public IProcessInfo[] getProcessList() {
return fProcessList;
}
private void parse() {
List<IProcessInfo> aList = new ArrayList<IProcessInfo>();
if (isDone()) {
MIOutput out = getMIOutput();
MIOOBRecord[] oobs = out.getMIOOBRecords();
for (int i = 0; i < oobs.length; i++) {
if (oobs[i] instanceof MITargetStreamOutput) {
MIStreamRecord cons = (MIStreamRecord) oobs[i];
String str = cons.getString().trim();
if (str.length() > 0) {
// Parsing pattern of type @" 26 N 0 N 32794 Idle 2 Http daemon\n"
Pattern pattern = Pattern.compile("(\\d*)\\s(Y|N)\\s*\\d*\\s(Y|N)\\s*\\d*\\s*\\D*\\s*\\d\\s(.*)", Pattern.MULTILINE); //$NON-NLS-1$
Matcher matcher = pattern.matcher(str);
if (matcher.find()) {
ProcessInfo proc = new ProcessInfo(matcher.group(1), matcher.group(4));
aList.add(proc);
}
}
}
}
}
fProcessList = aList.toArray(new IProcessInfo[aList.size()]);
}
}

4
plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/launching/TestLaunchDelegate.java
View file

@ -81,7 +81,7 @@ public class TestLaunchDelegate extends LaunchConfigurationDelegate
monitor.worked( 1 ); monitor.worked( 1 );
final ServicesLaunchSequence servicesLaunchSequence = final ServicesLaunchSequence servicesLaunchSequence =
new ServicesLaunchSequence(launch.getSession(), launch, exePath); new ServicesLaunchSequence(launch.getSession(), launch, exePath, SessionType.LOCAL, false);
launch.getSession().getExecutor().execute(servicesLaunchSequence); launch.getSession().getExecutor().execute(servicesLaunchSequence);
try { try {
servicesLaunchSequence.get(); servicesLaunchSequence.get();
@ -99,7 +99,7 @@ public class TestLaunchDelegate extends LaunchConfigurationDelegate
// Create and invoke the final launch sequence to setup GDB // Create and invoke the final launch sequence to setup GDB
final FinalLaunchSequence finalLaunchSequence = final FinalLaunchSequence finalLaunchSequence =
new FinalLaunchSequence(launch.getSession().getExecutor(), launch, SessionType.RUN); new FinalLaunchSequence(launch.getSession().getExecutor(), launch, SessionType.LOCAL, false);
launch.getSession().getExecutor().execute(finalLaunchSequence); launch.getSession().getExecutor().execute(finalLaunchSequence);
try { try {
finalLaunchSequence.get(); finalLaunchSequence.get();