Attachment 164616 Details for Bug 306427 – Fix

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

[patch] Fix

patch_306427 (text/plain), 11.14 KB, created by John Cortell

on 2010-04-12 15:01:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Cortell

Created: 2010-04-12 15:01:04 EDT

Size: 11.14 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.gdb
>Index: src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java,v
>retrieving revision 1.1
>diff -u -r1.1 IEventBreakpointConstants.java
>--- src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java	8 Apr 2010 18:11:57 -0000	1.1
>+++ src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java	12 Apr 2010 19:00:21 -0000
>@@ -1,3 +1,13 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 Freescale Semiconductor and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors: 
>+ *     Freescale Semiconductor - Initial API and implementation
>+ *******************************************************************************/
> package org.eclipse.cdt.gdb.eventbkpts;
> 
> public interface IEventBreakpointConstants {
>@@ -19,15 +29,6 @@
> 
> 	/**
> 	 * An event breakpoint of this type suspends the target program when it
>-	 * catches a signal (POSIX). This type of event has a single parameter of
>-	 * type in, indicating the specific signal.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_SIGNAL_CATCH = "org.eclipse.cdt.debug.gdb.signal"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when it
> 	 * calls fork() (POSIX). This type of event has no parameters.
> 	 * 
> 	 * @since 7.0
>@@ -52,67 +53,10 @@
> 
> 	/**
> 	 * An event breakpoint of this type suspends the target program when it
>-	 * calls exit() (POSIX). This type of event has no parameters.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_EXIT = "org.eclipse.cdt.debug.gdb.catch_exit"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when a new
>-	 * process starts. This type of event has no parameters.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_PROCESS_START = "org.eclipse.cdt.debug.gdb.catch_start"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when a
>-	 * process exits. This type of event has no parameters.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_PROCESS_STOP = "org.eclipse.cdt.debug.gdb.catch_stop"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when a new
>-	 * thread starts. This type of event has no parameters.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_THREAD_START = "org.eclipse.cdt.debug.gdb.catch_thread_start"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when a
>-	 * thread exits. This type of event has no parameters.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_THREAD_EXIT = "org.eclipse.cdt.debug.gdb.catch_thread_exit"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when a
>-	 * thread joins another one (waits for it to exit) This type of event has no
>-	 * parameters.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_THREAD_JOIN = "org.eclipse.cdt.debug.gdb.catch_thread_join"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when it
>-	 * loads a library. This type of event has no parameters.
>+	 * makes a system call (POSIX). This type of event takes a single parameter:
>+	 * the name or number of the system call.
> 	 * 
> 	 * @since 7.0
> 	 */
>-	public static final String EVENT_TYPE_LIBRARY_LOAD = "org.eclipse.cdt.debug.gdb.catch_load"; //$NON-NLS-1$
>-
>-	/**
>-	 * An event breakpoint of this type suspends the target program when it
>-	 * unloads a library. This type of event has no parameters.
>-	 * 
>-	 * @since 7.0
>-	 */
>-	public static final String EVENT_TYPE_LIBRARY_UNLOAD = "org.eclipse.cdt.debug.gdb.catch_unload"; //$NON-NLS-1$
>-
>+	public static final String EVENT_TYPE_SYSCALL = "org.eclipse.cdt.debug.gdb.catch_syscall"; //$NON-NLS-1$
> }
>Index: src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java,v
>retrieving revision 1.1
>diff -u -r1.1 GdbCatchpoints.java
>--- src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java	8 Apr 2010 20:02:29 -0000	1.1
>+++ src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java	12 Apr 2010 19:00:21 -0000
>@@ -24,18 +24,10 @@
> 		// to event breakpoints selector
> 		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_CATCH, "catch"); //$NON-NLS-1$
> 		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THROW, "throw"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_SIGNAL_CATCH, "signal"); //$NON-NLS-1$
> 		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_EXEC, "exec"); //$NON-NLS-1$
> 		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_FORK, "fork"); //$NON-NLS-1$
> 		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_VFORK, "vfork"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_EXIT, "exit"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_PROCESS_START, "start"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_PROCESS_STOP, "stop"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THREAD_START, "thread_start"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THREAD_EXIT, "thread_exit"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_THREAD_JOIN, "thread_join"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_LIBRARY_LOAD, "load"); //$NON-NLS-1$
>-		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_LIBRARY_UNLOAD, "unload"); //$NON-NLS-1$
>+		sIdToKeyword.put(IEventBreakpointConstants.EVENT_TYPE_SYSCALL, "syscall"); //$NON-NLS-1$
> 	}
> 
> 	/**
>#P org.eclipse.cdt.gdb.ui
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.gdb.ui/plugin.properties,v
>retrieving revision 1.1
>diff -u -r1.1 plugin.properties
>--- plugin.properties	8 Apr 2010 18:12:08 -0000	1.1
>+++ plugin.properties	12 Apr 2010 19:00:21 -0000
>@@ -12,21 +12,12 @@
> providerName=Eclipse CDT
> 
> catchType.label = Event Type
>-catchSignal.label = Signal Caught
>-catchSignal.arg.label = Signal Number
>-catchCatch.label = Exception Caught
>-catchThrow.label = Exception Thrown
>+catchSyscall.label = syscall called
>+catchSyscall.arg.label = System call name or number
>+catchCatch.label = exception caught
>+catchThrow.label = exception thrown
> 
>-#Note: fork, vfork and exec is not translatable words
>-catchFork.label = Stop on fork
>-catchVfork.label = Stop on vfork
>-catchExec.label = Stop on exec
>-
>-catchExit.label = Process exit
>-catchStop.label = Process suspend
>-catchStart.label = Process start
>-catchThreadExit.label = Thread exit
>-catchThreadStart.label = Thread start
>-catchThreadJoin.label =  Thread join
>-catchLoad.label = Library load
>-catchUnload.label = Library unload
>+#Note: fork, vfork and exec are not translatable words
>+catchFork.label = fork called
>+catchVfork.label = vfork called
>+catchExec.label = exec called
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.gdb.ui/plugin.xml,v
>retrieving revision 1.1
>diff -u -r1.1 plugin.xml
>--- plugin.xml	8 Apr 2010 18:12:09 -0000	1.1
>+++ plugin.xml	12 Apr 2010 19:00:21 -0000
>@@ -12,11 +12,11 @@
> 	        	label="%catchThrow.label"
> 	        	value="org.eclipse.cdt.debug.gdb.throw"/>
> 			<value 
>-				label="%catchSignal.label"
>-				value="org.eclipse.cdt.debug.gdb.signal">
>+				label="%catchSyscall.label"
>+				value="org.eclipse.cdt.debug.gdb.catch_syscall">
> 				<attribute 
>-					name="org.eclipse.cdt.debug.core.eventbreakpoint_event_arg" label="%catchSignal.arg.label" 
>-					type="integer" fieldEditor="org.eclipse.jface.preference.IntegerFieldEditor"/>
>+					name="org.eclipse.cdt.debug.core.eventbreakpoint_event_arg" label="%catchSyscall.arg.label" 
>+					type="string" fieldEditor="org.eclipse.jface.preference.StringFieldEditor"/>
> 			</value>
> 			<value
> 				label="%catchFork.label"
>@@ -27,30 +27,6 @@
> 			<value
> 				label="%catchExec.label"
> 				value="org.eclipse.cdt.debug.gdb.catch_exec"/>
>-			<value 
>-				label="%catchExit.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_exit"/>
>-			<value 
>-				label="%catchStop.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_stop"/>
>-			<value 
>-				label="%catchStart.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_start"/>
>-			<value 
>-				label="%catchThreadStart.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_thread_start"/>
>-			<value 
>-				label="%catchThreadExit.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_thread_exit"/>
>-			<value 
>-				label="%catchThreadJoin.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_thread_join"/>
>-			<value 
>-				label="%catchLoad.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_load"/>
>-			<value 
>-				label="%catchUnload.label"
>-				value="org.eclipse.cdt.debug.gdb.catch_unload"/>
> 		</attribute> 
> 	</breakpointLabels>
> </extension>
>#P org.eclipse.cdt.tests.dsf.gdb
>Index: src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 MICatchpointsTest.java
>--- src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java	8 Apr 2010 20:02:33 -0000	1.3
>+++ src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java	12 Apr 2010 19:00:22 -0000
>@@ -1201,9 +1201,9 @@
> 	@Test
> 	public void catchpointConversions() throws Throwable {
> 		assertEquals("catch", GdbCatchpoints.eventToGdbCatchpointKeyword(IEventBreakpointConstants.EVENT_TYPE_CATCH));
>-		assertEquals("signal", GdbCatchpoints.eventToGdbCatchpointKeyword(IEventBreakpointConstants.EVENT_TYPE_SIGNAL_CATCH));
>+		assertEquals("syscall", GdbCatchpoints.eventToGdbCatchpointKeyword(IEventBreakpointConstants.EVENT_TYPE_SYSCALL));
> 		assertEquals(IEventBreakpointConstants.EVENT_TYPE_CATCH, GdbCatchpoints.gdbCatchpointKeywordToEvent("catch"));
>-		assertEquals(IEventBreakpointConstants.EVENT_TYPE_SIGNAL_CATCH, GdbCatchpoints.gdbCatchpointKeywordToEvent("signal"));
>+		assertEquals(IEventBreakpointConstants.EVENT_TYPE_SYSCALL, GdbCatchpoints.gdbCatchpointKeywordToEvent("syscall"));
> 		assertNull(GdbCatchpoints.gdbCatchpointKeywordToEvent("signa"));
> 		assertNull(GdbCatchpoints.gdbCatchpointKeywordToEvent("signals"));
> 	}

Flags:

john.cortell: iplog-

Actions: View | Diff

Attachments on bug 306427: 164616