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

Merge remote-tracking branch 'cdt/master' into sd90

Browse source
This commit is contained in:
Andrew Gvozdev 2012-05-01 10:48:17 -04:00
commit e25628b567
3 changed files with 145 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

213
debug/org.eclipse.cdt.debug.ui/plugin.xml
View file

@ -2158,6 +2158,8 @@
</extension>
<extension
point="org.eclipse.ui.menus">
<!-- Reverse debugging contributions to Debug view -->
<menuContribution
locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=additions">
<command
@ -2165,11 +2167,11 @@
icon="icons/obj16/reverse_toggle.gif"
label="%ReverseToggle.label"
style="toggle">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingActionSetActive">
</reference>
<visibleWhen checkEnabled="false">
<and>
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingActionSetActive"/>
<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
</and>
</visibleWhen>
</command>
</menuContribution>
@ -2180,11 +2182,11 @@
icon="icons/obj16/reverse_resume.gif"
label="%ReverseResume.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<and>
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
</and>
</visibleWhen>
</command>
</menuContribution>
@ -2195,11 +2197,11 @@
icon="icons/obj16/reverse_stepinto.gif"
label="%ReverseStepInto.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<and>
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
</and>
</visibleWhen>
</command>
</menuContribution>
@ -2210,11 +2212,11 @@
icon="icons/obj16/reverse_stepover.gif"
label="%ReverseStepOver.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<and>
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
</and>
</visibleWhen>
</command>
</menuContribution>
@ -2225,14 +2227,16 @@
icon="icons/obj16/uncall.gif"
label="%Uncall.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<and>
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
</and>
</visibleWhen>
</command>
</menuContribution>
<!-- Reverse debugging contributions to Run menu -->
<menuContribution
locationURI="menu:org.eclipse.ui.run?before=stepGroup">
<command
@ -2240,26 +2244,20 @@
icon="icons/obj16/reverse_toggle.gif"
label="%ReverseToggle.label"
style="toggle">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingActionSetActive">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingActionSetActive"/>
</visibleWhen>
</command>
</menuContribution>
</menuContribution>
<menuContribution
locationURI="menu:org.eclipse.ui.run?after=stepGroup">
locationURI="menu:org.eclipse.ui.run?before=threadGroup">
<command
commandId="org.eclipse.cdt.debug.ui.command.reverseResume"
icon="icons/obj16/reverse_resume.gif"
label="%ReverseResume.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
@ -2270,11 +2268,8 @@
icon="icons/obj16/reverse_stepinto.gif"
label="%ReverseStepInto.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
@ -2285,11 +2280,8 @@
icon="icons/obj16/reverse_stepover.gif"
label="%ReverseStepOver.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
@ -2300,14 +2292,13 @@
icon="icons/obj16/uncall.gif"
label="%Uncall.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
<!-- Reverse debugging contributions to Debug view popup -->
<menuContribution
locationURI="popup:org.eclipse.debug.ui.DebugView?before=stepGroup">
<command
@ -2315,11 +2306,8 @@
icon="icons/obj16/reverse_toggle.gif"
label="%ReverseToggle.label"
style="toggle">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingActionSetActive">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingActionSetActive"/>
</visibleWhen>
</command>
</menuContribution>
@ -2330,11 +2318,8 @@
icon="icons/obj16/reverse_resume.gif"
label="%ReverseResume.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
@ -2345,11 +2330,8 @@
icon="icons/obj16/reverse_stepinto.gif"
label="%ReverseStepInto.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
@ -2360,11 +2342,8 @@
icon="icons/obj16/reverse_stepover.gif"
label="%ReverseStepOver.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
@ -2375,11 +2354,8 @@
icon="icons/obj16/uncall.gif"
label="%Uncall.label"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled">
</reference>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
@ -2390,26 +2366,84 @@
icon="icons/obj16/start_tracing_obj.gif"
label="%StartTracing.name"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsTracepointActionSetActive">
</reference>
</visibleWhen>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
<command
commandId="org.eclipse.cdt.debug.ui.command.stopTracing"
icon="icons/obj16/stop_tracing_obj.gif"
label="%StopTracing.name"
style="push">
<visibleWhen
checkEnabled="false">
<reference
definitionId="org.eclipse.cdt.debug.ui.testIsTracepointActionSetActive">
</reference>
</visibleWhen>
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
<!-- Reverse debugging contributions to Main Debug Menu -->
<menuContribution
locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=additions">
<command
commandId="org.eclipse.cdt.debug.ui.command.reverseToggle"
icon="icons/obj16/reverse_toggle.gif"
label="%ReverseToggle.label"
style="toggle">
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingActionSetActive"/>
</visibleWhen>
</command>
</menuContribution>
<menuContribution
locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?before=threadGroup">
<command
commandId="org.eclipse.cdt.debug.ui.command.reverseResume"
icon="icons/obj16/reverse_resume.gif"
label="%ReverseResume.label"
style="push">
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
<menuContribution
locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?before=stepIntoGroup">
<command
commandId="org.eclipse.cdt.debug.ui.command.reverseStepInto"
icon="icons/obj16/reverse_stepinto.gif"
label="%ReverseStepInto.label"
style="push">
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
<menuContribution
locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?before=stepOverGroup">
<command
commandId="org.eclipse.cdt.debug.ui.command.reverseStepOver"
icon="icons/obj16/reverse_stepover.gif"
label="%ReverseStepOver.label"
style="push">
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
<menuContribution
locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?before=stepReturnGroup">
<command
commandId="org.eclipse.cdt.debug.ui.command.uncall"
icon="icons/obj16/uncall.gif"
label="%Uncall.label"
style="push">
<visibleWhen checkEnabled="false">
<reference definitionId="org.eclipse.cdt.debug.ui.testIsReverseDebuggingEnabled"/>
</visibleWhen>
</command>
</menuContribution>
<!-- Group context contributions to Debug view toolbar -->
<menuContribution
locationURI="popup:org.eclipse.debug.ui.DebugView?after=emptyStepGroup">
<command
@ -2457,6 +2491,7 @@
</visibleWhen>
</command>
</menuContribution>
</extension>
<!-- Cast to Type / Display as Array -->

16
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/commands/ReverseToggleCommandHandler.java
View file

@ -127,14 +127,22 @@ public class ReverseToggleCommandHandler extends DebugCommandHandler implements
@Override
protected void postExecute(IRequest request, Object[] targets) {
super.postExecute(request, targets);
// request re-evaluation of property "org.eclipse.cdt.debug.ui.isReverseDebuggingEnabled"
new WorkbenchJob("") { //$NON-NLS-1$
@Override
public IStatus runInUIThread(IProgressMonitor monitor) {
IEvaluationService exprService = (IEvaluationService) PlatformUI.getWorkbench().getService(IEvaluationService.class);
if (exprService != null) {
exprService.requestEvaluation("org.eclipse.cdt.debug.ui.isReverseDebuggingEnabled"); //$NON-NLS-1$
// Request re-evaluation of property "org.eclipse.cdt.debug.ui.isReverseDebuggingEnabled" to update
// visibility of reverse stepping commands.
IEvaluationService exprService = (IEvaluationService) PlatformUI.getWorkbench().getService(IEvaluationService.class);
if (exprService != null) {
exprService.requestEvaluation("org.eclipse.cdt.debug.ui.isReverseDebuggingEnabled"); //$NON-NLS-1$
}
// Refresh reverse toggle commands with the new state of reverse enabled.
// This is in order to keep multiple toggle actions in UI in sync.
ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
if (commandService != null) {
commandService.refreshElements(REVERSE_TOGGLE_COMMAND_ID, null);
}
return Status.OK_STATUS;
}
}.schedule();

10
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_1.java
View file

@ -175,8 +175,16 @@ public class GDBProcesses_7_1 extends GDBProcesses_7_0 {
if (getData().getThreadList().length != 0) {
MIThread thread = getData().getThreadList()[0];
if (thread.getThreadId().equals(threadDmc.getId())) {
String id = thread.getOsId();
// append thread details (if any) to the thread ID
// as for GDB 6.x with CLIInfoThreadsInfo#getOsId()
final String details = thread.getDetails();
if (details != null && details.length() > 0) {
id += " (" + details + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
String core = thread.getCore();
threadData = new MIThreadDMData_7_1("", thread.getOsId(), //$NON-NLS-1$
threadData = new MIThreadDMData_7_1("", id, //$NON-NLS-1$
core == null ? null : new String[] { core });
}
}