Attachment #138361 for bug #234468

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




import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControl;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService;
import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;
import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch;
import org.eclipse.cdt.dsf.gdb.service.IGDBBackend;

import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
import org.eclipse.cdt.dsf.mi.service.MIProcesses;
import org.eclipse.cdt.dsf.mi.service.IMIBackend.BackendStateChangedEvent;
import org.eclipse.cdt.dsf.mi.service.MIProcesses.ContainerExitedDMEvent;
import org.eclipse.cdt.dsf.mi.service.MIProcesses.ContainerStartedDMEvent;
import org.eclipse.cdt.dsf.mi.service.command.AbstractCLIProcess;
import org.eclipse.cdt.dsf.mi.service.command.AbstractMIControl;

import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.ILaunchConfiguration;

        }
    }
    
    /** @since 2.0 */
    @DsfServiceEventHandler 
    public void eventDispatched(ContainerExitedDMEvent e) {
    	if (Platform.getPreferencesService().getBoolean("org.eclipse.cdt.dsf.gdb.ui",  //$NON-NLS-1$
    													IGdbDebugPreferenceConstants.PREF_AUTO_TERMINATE_GDB,
    													true, null)) {
    		// If the inferior finishes, let's terminate GDB
    		terminate(new RequestMonitor(getExecutor(), null));
    	}
    }
    
    public static class InitializationShutdownStep extends Sequence.Step {
        public enum Direction { INITIALIZING, SHUTTING_DOWN }
        

Lines 30-41 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java (+29 lines)
30	import org.eclipse.cdt.dsf.debug.service.command.ICommandControl;	30	import org.eclipse.cdt.dsf.debug.service.command.ICommandControl;
31	import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService;	31	import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService;
32	import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;	32	import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
		33	import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;
33	import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;	34	import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
34	import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch;	35	import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch;
35	import org.eclipse.cdt.dsf.gdb.service.GDBRunControl_7_0;	36	import org.eclipse.cdt.dsf.gdb.service.GDBRunControl_7_0;
36	import org.eclipse.cdt.dsf.gdb.service.IGDBBackend;	37	import org.eclipse.cdt.dsf.gdb.service.IGDBBackend;
37	import org.eclipse.cdt.dsf.gdb.service.IReverseRunControl;	38	import org.eclipse.cdt.dsf.gdb.service.IReverseRunControl;
38	import org.eclipse.cdt.dsf.gdb.service.SessionType;	39	import org.eclipse.cdt.dsf.gdb.service.SessionType;
		40	import org.eclipse.cdt.dsf.gdb.service.GDBProcesses_7_0.ContainerExitedDMEvent;
		41	import org.eclipse.cdt.dsf.gdb.service.GDBProcesses_7_0.ContainerStartedDMEvent;
39	import org.eclipse.cdt.dsf.mi.service.IMIBackend;	42	import org.eclipse.cdt.dsf.mi.service.IMIBackend;
40	import org.eclipse.cdt.dsf.mi.service.IMIProcesses;	43	import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
41	import org.eclipse.cdt.dsf.mi.service.MIProcesses;	44	import org.eclipse.cdt.dsf.mi.service.MIProcesses;
Lines 61-66 Link Here
61	import org.eclipse.cdt.utils.pty.PTY;	64	import org.eclipse.cdt.utils.pty.PTY;
62	import org.eclipse.core.runtime.CoreException;	65	import org.eclipse.core.runtime.CoreException;
63	import org.eclipse.core.runtime.IStatus;	66	import org.eclipse.core.runtime.IStatus;
		67	import org.eclipse.core.runtime.Platform;
64	import org.eclipse.core.runtime.Status;	68	import org.eclipse.core.runtime.Status;
65	import org.eclipse.debug.core.DebugException;	69	import org.eclipse.debug.core.DebugException;
66	import org.eclipse.debug.core.ILaunchConfiguration;	70	import org.eclipse.debug.core.ILaunchConfiguration;
Lines 542-547 Link Here
542	}	546	}
543	}	547	}
544		548
		549	/** @since 2.0 */
		550	@DsfServiceEventHandler
		551	public void eventDispatched(ContainerStartedDMEvent e) {
		552	setConnected(true);
		553	}
		554
		555	/** @since 2.0 */
		556	@DsfServiceEventHandler
		557	public void eventDispatched(ContainerExitedDMEvent e) {
		558	setConnected(false);
		559
		560	if (Platform.getPreferencesService().getBoolean("org.eclipse.cdt.dsf.gdb.ui", //$NON-NLS-1$
		561	IGdbDebugPreferenceConstants.PREF_AUTO_TERMINATE_GDB,
		562	true, null)) {
		563	if (!isConnected() &&
		564	!(fMIBackend.getIsAttachSession() &&
		565	fMIBackend.getSessionType() == SessionType.REMOTE)) {
		566	// If the last process we are debugging finishes, let's terminate GDB
		567	// but not for a remote attach session, since we could request to attach
		568	// to another process
		569	terminate(new RequestMonitor(getExecutor(), null));
		570	}
		571	}
		572	}
		573
545	public static class InitializationShutdownStep extends Sequence.Step {	574	public static class InitializationShutdownStep extends Sequence.Step {
546	public enum Direction { INITIALIZING, SHUTTING_DOWN }	575	public enum Direction { INITIALIZING, SHUTTING_DOWN }
547		576




    @DsfServiceEventHandler
    public void eventDispatched(IStartedDMEvent e) {
    	if (e instanceof ContainerStartedDMEvent) {
			// This will increment the connect count
			fCommandControl.setConnected(true);

    		fContainerCommandCache.reset();
    	} else {
    		fThreadCommandCache.reset();

    @DsfServiceEventHandler
    public void eventDispatched(IExitedDMEvent e) {
    	if (e instanceof ContainerExitedDMEvent) {
			// This will decrement the connect count
			fCommandControl.setConnected(false);

    		fContainerCommandCache.reset();
    	} else {
    		fThreadCommandCache.reset();




/*******************************************************************************
 * Copyright (c) 2009 Ericsson 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:
 *     Ericsson - initial implementation
 *******************************************************************************/
package org.eclipse.cdt.dsf.gdb;

import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;



/**
 * @noimplement This interface is not intended to be implemented by clients.
 * @since 2.0
 */
public interface IGdbDebugPreferenceConstants {
	
	/**
	 * Boolean preference whether to enable GDB traces. Default is <code>true</code>. 
	 */
	public static final String PREF_TRACES_ENABLE = "tracesEnable"; //$NON-NLS-1$

	/**
	 * Boolean preference whether to automatically terminate GDB when the inferior exists. Default is <code>true</code>. 
	 */
	public static final String PREF_AUTO_TERMINATE_GDB = "autoTerminateGdb"; //$NON-NLS-1$
	
    /**
     * Help prefixes.
     */
    public static final String PREFIX = GdbPlugin.PLUGIN_ID + "."; //$NON-NLS-1$
    
    public static final String PREFERENCE_PAGE= PREFIX + "preference_page_context"; //$NON-NLS-1$
}


Lines 10-17 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/internal/ui/tracing/TracingConsoleManager.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.dsf.gdb.internal.ui.tracing;	11	package org.eclipse.cdt.dsf.gdb.internal.ui.tracing;
12		12
		13	import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;
13	import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin;	14	import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin;
14	import org.eclipse.cdt.dsf.gdb.internal.ui.preferences.IGdbDebugPreferenceConstants;
15	import org.eclipse.cdt.dsf.gdb.launching.ITracedLaunch;	15	import org.eclipse.cdt.dsf.gdb.launching.ITracedLaunch;
16	import org.eclipse.debug.core.DebugPlugin;	16	import org.eclipse.debug.core.DebugPlugin;
17	import org.eclipse.debug.core.ILaunch;	17	import org.eclipse.debug.core.ILaunch;

Lines 10-15 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbPreferenceInitializer.java (+2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.dsf.gdb.internal.ui.preferences;	11	package org.eclipse.cdt.dsf.gdb.internal.ui.preferences;
12		12
		13	import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;
13	import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin;	14	import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin;
14	import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;	15	import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
15	import org.eclipse.jface.preference.IPreferenceStore;	16	import org.eclipse.jface.preference.IPreferenceStore;
Lines 22-26 Link Here
22	public void initializeDefaultPreferences() {	23	public void initializeDefaultPreferences() {
23	IPreferenceStore store = GdbUIPlugin.getDefault().getPreferenceStore();	24	IPreferenceStore store = GdbUIPlugin.getDefault().getPreferenceStore();
24	store.setDefault(IGdbDebugPreferenceConstants.PREF_TRACES_ENABLE, true);	25	store.setDefault(IGdbDebugPreferenceConstants.PREF_TRACES_ENABLE, true);
		26	store.setDefault(IGdbDebugPreferenceConstants.PREF_AUTO_TERMINATE_GDB, true);
25	}	27	}
26	}	28	}

Lines 16-22 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/IGdbDebugPreferenceConstants.java (+2 lines)
16	/**	16	/**
17	* @noimplement This interface is not intended to be implemented by clients.	17	* @noimplement This interface is not intended to be implemented by clients.
18	* @since 2.0	18	* @since 2.0
		19	* @deprecated Has been replaced with org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants
19	*/	20	*/
		21	@Deprecated
20	public interface IGdbDebugPreferenceConstants {	22	public interface IGdbDebugPreferenceConstants {
21		23
22	/**	24	/**

Lines 21-26 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java (+2 lines)
21	public static String GdbDebugPreferencePage_description;	21	public static String GdbDebugPreferencePage_description;
22	public static String GdbDebugPreferencePage_traces_label;	22	public static String GdbDebugPreferencePage_traces_label;
23	public static String GdbDebugPreferencePage_enableTraces_label;	23	public static String GdbDebugPreferencePage_enableTraces_label;
		24	public static String GdbDebugPreferencePage_termination_label;
		25	public static String GdbDebugPreferencePage_autoTerminateGdb_label;
24		26
25	static {	27	static {
26	// initialize resource bundle	28	// initialize resource bundle

Lines 10-14 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/messages.properties (+4 lines)
10	###############################################################################	10	###############################################################################
11		11
12	GdbDebugPreferencePage_description=General settings for GDB Debugging	12	GdbDebugPreferencePage_description=General settings for GDB Debugging
		13
13	GdbDebugPreferencePage_traces_label=Traces	14	GdbDebugPreferencePage_traces_label=Traces
14	GdbDebugPreferencePage_enableTraces_label=Enable GDB traces	15	GdbDebugPreferencePage_enableTraces_label=Enable GDB traces
		16
		17	GdbDebugPreferencePage_termination_label=Termination
		18	GdbDebugPreferencePage_autoTerminateGdb_label=Terminate GDB when last process exits




 *******************************************************************************/
package org.eclipse.cdt.dsf.gdb.internal.ui.preferences;

import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;
import org.eclipse.cdt.dsf.gdb.internal.ui.GdbUIPlugin;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;

		layout.marginWidth= 0;
		parent.setLayout(layout);
		
		Group group= new Group(parent, SWT.NONE);
		group.setText(MessagesForPreferences.GdbDebugPreferencePage_traces_label);
		GridLayout groupLayout= new GridLayout(3, false);
		group.setLayout(groupLayout);
		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

		BooleanFieldEditor boolField= new BooleanFieldEditor(
				IGdbDebugPreferenceConstants.PREF_TRACES_ENABLE,
				MessagesForPreferences.GdbDebugPreferencePage_enableTraces_label,
				group);

		boolField.fillIntoGrid(group, 3);
		addField(boolField);
		// need to set layout again
		group.setLayout(groupLayout);
		
		group= new Group(parent, SWT.NONE);
		group.setText(MessagesForPreferences.GdbDebugPreferencePage_termination_label);
		groupLayout= new GridLayout(3, false);
		group.setLayout(groupLayout);
		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

		boolField= new BooleanFieldEditor(
				IGdbDebugPreferenceConstants.PREF_AUTO_TERMINATE_GDB,
				MessagesForPreferences.GdbDebugPreferencePage_autoTerminateGdb_label,
				group);

		boolField.fillIntoGrid(group, 3);
		addField(boolField);
		// need to set layout again
		group.setLayout(groupLayout);

	}

	@Override

Return to bug 234468

Lines 850-858 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java (-6 lines)
850	@DsfServiceEventHandler	850	@DsfServiceEventHandler
851	public void eventDispatched(IStartedDMEvent e) {	851	public void eventDispatched(IStartedDMEvent e) {
852	if (e instanceof ContainerStartedDMEvent) {	852	if (e instanceof ContainerStartedDMEvent) {
853	// This will increment the connect count
854	fCommandControl.setConnected(true);
855
856	fContainerCommandCache.reset();	853	fContainerCommandCache.reset();
857	} else {	854	} else {
858	fThreadCommandCache.reset();	855	fThreadCommandCache.reset();
Lines 863-871 Link Here
863	@DsfServiceEventHandler	860	@DsfServiceEventHandler
864	public void eventDispatched(IExitedDMEvent e) {	861	public void eventDispatched(IExitedDMEvent e) {
865	if (e instanceof ContainerExitedDMEvent) {	862	if (e instanceof ContainerExitedDMEvent) {
866	// This will decrement the connect count
867	fCommandControl.setConnected(false);
868
869	fContainerCommandCache.reset();	863	fContainerCommandCache.reset();
870	} else {	864	} else {
871	fThreadCommandCache.reset();	865	fThreadCommandCache.reset();

Added Link Here

(-)src/org/eclipse/cdt/dsf/gdb/IGdbDebugPreferenceConstants.java (+40 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 Ericsson and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Ericsson - initial implementation
10	*******************************************************************************/
11	package org.eclipse.cdt.dsf.gdb;
12
13	import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
14
15
16
17	/**
18	* @noimplement This interface is not intended to be implemented by clients.
19	* @since 2.0
20	*/
21	public interface IGdbDebugPreferenceConstants {
22
23	/**
24	* Boolean preference whether to enable GDB traces. Default is <code>true</code>.
25	*/
26	public static final String PREF_TRACES_ENABLE = "tracesEnable"; //$NON-NLS-1$
27
28	/**
29	* Boolean preference whether to automatically terminate GDB when the inferior exists. Default is <code>true</code>.
30	*/
31	public static final String PREF_AUTO_TERMINATE_GDB = "autoTerminateGdb"; //$NON-NLS-1$
32
33	/**
34	* Help prefixes.
35	*/
36	public static final String PREFIX = GdbPlugin.PLUGIN_ID + "."; //$NON-NLS-1$
37
38	public static final String PREFERENCE_PAGE= PREFIX + "preference_page_context"; //$NON-NLS-1$
39	}
40