Attachment 116231 Details for Bug 252283 – my fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] my fix

ToDSF_Bug252283_20081027.txt (text/plain), 2.71 KB, created by Ling Wang

on 2008-10-27 18:38:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ling Wang

Created: 2008-10-27 18:38:38 EDT

Size: 2.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dd.gdb
>Index: src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.dd.dsf/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java,v
>retrieving revision 1.36
>diff -u -r1.36 GDBControl.java
>--- src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	20 Oct 2008 14:27:13 -0000	1.36
>+++ src/org/eclipse/dd/gdb/internal/provisional/service/command/GDBControl.java	27 Oct 2008 22:33:44 -0000
>@@ -51,6 +51,7 @@
> import org.eclipse.dd.mi.service.command.MIControlDMContext;
> import org.eclipse.dd.mi.service.command.MIInferiorProcess;
> import org.eclipse.dd.mi.service.command.MIRunControlEventProcessor;
>+import org.eclipse.dd.mi.service.command.commands.CLIExecAbort;
> import org.eclipse.dd.mi.service.command.commands.MIBreakInsert;
> import org.eclipse.dd.mi.service.command.commands.MICommand;
> import org.eclipse.dd.mi.service.command.commands.MIExecContinue;
>@@ -194,20 +195,32 @@
>             2, TimeUnit.SECONDS);
>         
>         queueCommand(
>-       		new MIGDBExit(fControlDmc),
>+       		// First "Kill" the debugged process, especially needed for remote debug.
>+       		new CLIExecAbort(getContext()),	
>             new DataRequestMonitor<MIInfo>(getExecutor(), rm) { 
>                 @Override
>-                public void handleCompleted() {
>-                    // Cancel the time out runnable (if it hasn't run yet).
>-                    if (quitTimeoutFuture.cancel(false)) {
>-                        if (!isSuccess()) {
>-                            fMIBackend.destroy();
>+                protected void handleCompleted() {
>+                	
>+                	// Regardless of status of "kill" command, now exit gdb.
>+                    queueCommand(
>+                   		new MIGDBExit(fControlDmc),
>+                        new DataRequestMonitor<MIInfo>(getExecutor(), rm) { 
>+                            @Override
>+                            public void handleCompleted() {
>+                                // Cancel the time out runnable (if it hasn't run yet).
>+                                if (quitTimeoutFuture.cancel(false)) {
>+                                    if (!isSuccess()) {
>+                                        fMIBackend.destroy();
>+                                    }
>+                                    rm.done();
>+                                }
>+                            }
>                         }
>-                        rm.done();
>-                    }
>+                    );
>                 }
>             }
>-        );
>+        );         
>+    	
>     }
>     
>     /*

Actions: View | Diff

Attachments on bug 252283: 116231 | 117232 | 117776