[306427] Remove obsolete catchpoint types from CDT

debug/org.eclipse.cdt.gdb.ui/plugin.properties

@@ -12,21 +12,12 @@ pluginName=GDB UI Common
 providerName=Eclipse CDT
 
 catchType.label = Event Type
-catchSignal.label = Signal Caught
+catchSyscall.label = syscall called
-catchSignal.arg.label = Signal Number
+catchSyscall.arg.label = System call name or number
-catchCatch.label = Exception Caught
+catchCatch.label = exception caught
-catchThrow.label = Exception Thrown
+catchThrow.label = exception thrown
 
-#Note: fork, vfork and exec is not translatable words
+#Note: fork, vfork and exec are not translatable words
-catchFork.label = Stop on fork
+catchFork.label = fork called
-catchVfork.label = Stop on vfork
+catchVfork.label = vfork called
-catchExec.label = Stop on exec
+catchExec.label = exec called
-
-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

debug/org.eclipse.cdt.gdb.ui/plugin.xml

@@ -12,11 +12,11 @@
 	        	label="%catchThrow.label"
 	        	value="org.eclipse.cdt.debug.gdb.throw"/>
 			<value 
-				label="%catchSignal.label"
+				label="%catchSyscall.label"
-				value="org.eclipse.cdt.debug.gdb.signal">
+				value="org.eclipse.cdt.debug.gdb.catch_syscall">
 				<attribute 
-					name="org.eclipse.cdt.debug.core.eventbreakpoint_event_arg" label="%catchSignal.arg.label" 
+					name="org.eclipse.cdt.debug.core.eventbreakpoint_event_arg" label="%catchSyscall.arg.label" 
-					type="integer" fieldEditor="org.eclipse.jface.preference.IntegerFieldEditor"/>
+					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>

debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/eventbkpts/IEventBreakpointConstants.java

@@ -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 {
@@ -17,15 +27,6 @@ public interface IEventBreakpointConstants {
 	 */
 	public static final String EVENT_TYPE_THROW = "org.eclipse.cdt.debug.gdb.throw"; //$NON-NLS-1$
 
-	/**
-	 * 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.
@@ -52,67 +53,10 @@ public interface IEventBreakpointConstants {
 
 	/**
 	 * An event breakpoint of this type suspends the target program when it
-	 * calls exit() (POSIX). 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_EXIT = "org.eclipse.cdt.debug.gdb.catch_exit"; //$NON-NLS-1$
+	public static final String EVENT_TYPE_SYSCALL = "org.eclipse.cdt.debug.gdb.catch_syscall"; //$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.
-	 * 
-	 * @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$
-
 }

debug/org.eclipse.cdt.gdb/src/org/eclipse/cdt/gdb/internal/eventbkpts/GdbCatchpoints.java

@@ -24,18 +24,10 @@ public class GdbCatchpoints {
 		// 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_SYSCALL, "syscall"); //$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$
 	}
 
 	/**

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MICatchpointsTest.java

@@ -1201,9 +1201,9 @@ public class MICatchpointsTest extends BaseTestCase {
 	@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"));
 	}