mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-26 20:41:45 +00:00
parent 17d26298d8
commit 49a4f3518f
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
View file

@ -65,12 +65,9 @@ import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.model.IProcess;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
public class GDBProcesses extends MIProcesses implements IGDBProcesses { public class GDBProcesses extends MIProcesses implements IGDBProcesses {
private class GDBContainerDMC extends MIContainerDMC private class GDBContainerDMC extends MIContainerDMC implements IMemoryDMContext {
implements IMemoryDMContext
{
public GDBContainerDMC(String sessionId, IProcessDMContext processDmc, String groupId) { public GDBContainerDMC(String sessionId, IProcessDMContext processDmc, String groupId) {
super(sessionId, processDmc, groupId); super(sessionId, processDmc, groupId);
} }
@ -188,7 +185,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
String name = fProcessNames.get(pid); String name = fProcessNames.get(pid);
if (name == null) { if (name == null) {
// Hm. Strange. But if the pid is our inferior's, we can just use the binary name // Hmm. Strange. But if the pid is our inferior's, we can just use the binary name
if (fProcId != null && Integer.parseInt(fProcId) == pid) { if (fProcId != null && Integer.parseInt(fProcId) == pid) {
name = fBackend.getProgramPath().lastSegment(); name = fBackend.getProgramPath().lastSegment();
} }
@ -561,7 +558,6 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
createConsole(containerDmc, restart, new RequestMonitor(ImmediateExecutor.getInstance(), requestMonitor) { createConsole(containerDmc, restart, new RequestMonitor(ImmediateExecutor.getInstance(), requestMonitor) {
@Override @Override
protected void handleSuccess() { protected void handleSuccess() {
final DataRequestMonitor<MIInfo> execMonitor = new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor) { final DataRequestMonitor<MIInfo> execMonitor = new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor) {
@Override @Override
protected void handleSuccess() { protected void handleSuccess() {
@ -653,14 +649,12 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
*/ */
@DsfServiceEventHandler @DsfServiceEventHandler
public void eventDispatched(MIStoppedEvent e) { public void eventDispatched(MIStoppedEvent e) {
// Postponed because 'info program' yields different result on different platforms.
// Post-poned because 'info program' yields different result on different platforms.
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=305385#c20 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=305385#c20
// //
// // Get the PID of the inferior through gdb (if we don't have it already) // // Get the PID of the inferior through gdb (if we don't have it already)
// //
// //
// fGdb.getInferiorProcess().update(); // fGdb.getInferiorProcess().update();
} }
} }

6
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java
View file

@ -93,12 +93,14 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate {
ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR); ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
} }
monitor.worked(1); monitor.worked(1);
boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false); boolean stopInMain = config.getAttribute(
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
String stopSymbol = null; String stopSymbol = null;
if (stopInMain) if (stopInMain) {
stopSymbol = launch.getLaunchConfiguration().getAttribute( stopSymbol = launch.getLaunchConfiguration().getAttribute(
ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL,
ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT); ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT);
}
ICDITarget[] targets = dsession.getTargets(); ICDITarget[] targets = dsession.getTargets();
for (int i = 0; i < targets.length; i++) { for (int i = 0; i < targets.length; i++) {