mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-05 07:15:39 +02:00
Code Issues Wiki Activity

Bug 565771: Allow to extend GdbConnectCommand PID prompting mechanism

Browse source 
- partially refactor connect method to connectToProcesses
- rename variables to match existing ones from other methods
(attachToProcesses and the PromptForPidJob constructor)
- change visibility for attachToProcesses from private -> protected

Change-Id: I62de9e1303895faac61fec011a8cce0d59d81f71
Signed-off-by: Dominic Scharfe <dominic.scharfe@coseda-tech.com>
This commit is contained in:
Dominic Scharfe 2020-08-03 09:49:34 +02:00 • committed by Jonah Graham
parent 0ede7c7a60
commit 0d50385e63
1 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java
View file

@ -417,39 +417,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
new ImmediateDataRequestMonitor<List<String>>(rm) { new ImmediateDataRequestMonitor<List<String>>(rm) {
@Override @Override
protected void handleSuccess() { protected void handleSuccess() {
List<String> dbgPids = getData(); connectToProcesses(controlCtx, procInfoList, getData(), rm);
// Prompt the user to choose one or more processes
new PromptForPidJob(
LaunchUIMessages
.getString("ProcessPrompter.PromptJob"), //$NON-NLS-1$
procInfoList.toArray(
new IProcessExtendedInfo[procInfoList
.size()]),
dbgPids,
new DataRequestMonitor<Object>(fExecutor, rm) {
@Override
protected void handleCancel() {
rm.cancel();
rm.done();
}
@Override
protected void handleSuccess() {
Object data = getData();
if (data instanceof IProcessExtendedInfo[]) {
attachToProcesses(controlCtx,
(IProcessExtendedInfo[]) data,
rm);
} else {
rm.done(new Status(IStatus.ERROR,
GdbUIPlugin.PLUGIN_ID,
IDsfStatusConstants.INTERNAL_ERROR,
"Invalid return type for process prompter", //$NON-NLS-1$
null));
}
}
}).schedule();
} }
}); });
} }
@ -538,7 +506,43 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
}); });
} }
private void attachToProcesses(final ICommandControlDMContext controlDmc, IProcessExtendedInfo[] processes, /**
* This method is called by {@link #connect(RequestMonitor)}.<br>
* The default implementation schedules a {@link PromptForPidJob}, which calls
* {@link #attachToProcesses(ICommandControlDMContext, IProcessExtendedInfo[], RequestMonitor)} on success.
*
* @param controlDmc
* @param processes
* @param dbgPids
* @param rm
*/
protected void connectToProcesses(final ICommandControlDMContext controlDmc,
final List<IProcessExtendedInfo> processes, List<String> debuggedProcesses, final RequestMonitor rm) {
// Prompt the user to choose one or more processes
new PromptForPidJob(LaunchUIMessages.getString("ProcessPrompter.PromptJob"), //$NON-NLS-1$
processes.toArray(new IProcessExtendedInfo[processes.size()]), debuggedProcesses,
new DataRequestMonitor<Object>(fExecutor, rm) {
@Override
protected void handleCancel() {
rm.cancel();
rm.done();
}
@Override
protected void handleSuccess() {
Object data = getData();
if (data instanceof IProcessExtendedInfo[]) {
attachToProcesses(controlDmc, (IProcessExtendedInfo[]) data, rm);
} else {
rm.done(new Status(IStatus.ERROR, GdbUIPlugin.PLUGIN_ID, IDsfStatusConstants.INTERNAL_ERROR,
"Invalid return type for process prompter", //$NON-NLS-1$
null));
}
}
}).schedule();
}
protected void attachToProcesses(final ICommandControlDMContext controlDmc, IProcessExtendedInfo[] processes,
final RequestMonitor rm) { final RequestMonitor rm) {
// For a local attach, GDB can figure out the binary automatically, // For a local attach, GDB can figure out the binary automatically,