From f7d191bfbb1446f06be69a3fed3d5e7a3343f6b4 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 17 Jul 2013 13:48:08 -0400 Subject: [PATCH] Bug 413188 - Stopping on shared library event should be reflected in the Debug view Change-Id: I1cb677279252f3f84799dd350613df976ae8c4e0 Reviewed-on: https://git.eclipse.org/r/14624 Reviewed-by: Marc Khouzam IP-Clean: Marc Khouzam Tested-by: Marc Khouzam Reviewed-by: Mikhail Khodjaiants IP-Clean: Mikhail Khodjaiants Tested-by: Mikhail Khodjaiants --- .../cdt/dsf/mi/service/command/MIRunControlEventProcessor.java | 3 +++ .../dsf/mi/service/command/MIRunControlEventProcessor_7_0.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java index f618ab46f2b..d169a1fa35f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java @@ -49,6 +49,7 @@ import org.eclipse.cdt.dsf.mi.service.command.events.MIInferiorExitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIInferiorSignalExitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MILocationReachedEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIRunningEvent; +import org.eclipse.cdt.dsf.mi.service.command.events.MISharedLibEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISignalEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISteppingRangeEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent; @@ -269,6 +270,8 @@ public class MIRunControlEventProcessor event = MILocationReachedEvent.parse(execDmc, exec.getToken(), exec.getMIResults()); } else if ("function-finished".equals(reason)) { //$NON-NLS-1$ event = MIFunctionFinishedEvent.parse(execDmc, exec.getToken(), exec.getMIResults()); + } else if ("solib-event".equals(reason)) { //$NON-NLS-1$ + event = MISharedLibEvent.parse(execDmc, exec.getToken(), exec.getMIResults(), null); } else if ("exited-normally".equals(reason) || "exited".equals(reason)) { //$NON-NLS-1$ //$NON-NLS-2$ event = MIInferiorExitEvent.parse(fCommandControl.getContext(), exec.getToken(), exec.getMIResults()); // Until we clean up the handling of all these events, we need to send the containerExited event diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java index 791e635107e..39a7384b25d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor_7_0.java @@ -44,6 +44,7 @@ import org.eclipse.cdt.dsf.mi.service.command.events.MIInferiorExitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIInferiorSignalExitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MILocationReachedEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIRunningEvent; +import org.eclipse.cdt.dsf.mi.service.command.events.MISharedLibEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISignalEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISteppingRangeEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIStoppedEvent; @@ -353,6 +354,8 @@ public class MIRunControlEventProcessor_7_0 event = MILocationReachedEvent.parse(execDmc, exec.getToken(), exec.getMIResults()); } else if ("function-finished".equals(reason)) { //$NON-NLS-1$ event = MIFunctionFinishedEvent.parse(execDmc, exec.getToken(), exec.getMIResults()); + } else if ("solib-event".equals(reason)) { //$NON-NLS-1$ + event = MISharedLibEvent.parse(execDmc, exec.getToken(), exec.getMIResults(), null); } else if (STOPPED_REASON.equals(reason)) { event = MIStoppedEvent.parse(execDmc, exec.getToken(), exec.getMIResults()); } else if (RUNNING_REASON.equals(reason)) {