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

Bug 119740: allow to specify only a subset of shared objects that we want symbols to be loaded for.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2006-04-10 20:47:23 +00:00
parent a0af806148
commit dae81c31ec
13 changed files with 392 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debug/org.eclipse.cdt.debug.mi.core/ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-10 Mikhail Khodjaiants
Bug 119740: allow to specify only a subset of shared objects that we want symbols to be loaded for.
* SharedLibraryManager.java
* GDBCDIDebugger2.java
* IMILaunchConfigurationConstants.java
* MICoreUtils.java
2006-04-10 Mikhail Khodjaiants 2006-04-10 Mikhail Khodjaiants
"set solib-search-path" and "show solib-search-path" are not supported on Windows. "set solib-search-path" and "show solib-search-path" are not supported on Windows.
* StandardWinCommandFactory.java * StandardWinCommandFactory.java

57
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java
View file

@ -11,12 +11,15 @@
package org.eclipse.cdt.debug.mi.core.cdi; package org.eclipse.cdt.debug.mi.core.cdi;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint; import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary; import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary;
@ -32,25 +35,27 @@ import org.eclipse.cdt.debug.mi.core.cdi.model.LocationBreakpoint;
import org.eclipse.cdt.debug.mi.core.cdi.model.SharedLibrary; import org.eclipse.cdt.debug.mi.core.cdi.model.SharedLibrary;
import org.eclipse.cdt.debug.mi.core.cdi.model.Target; import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
import org.eclipse.cdt.debug.mi.core.cdi.model.Watchpoint; import org.eclipse.cdt.debug.mi.core.cdi.model.Watchpoint;
import org.eclipse.cdt.debug.mi.core.command.CLIInfoSharedLibrary;
import org.eclipse.cdt.debug.mi.core.command.CLISharedLibrary;
import org.eclipse.cdt.debug.mi.core.command.CommandFactory; import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
import org.eclipse.cdt.debug.mi.core.command.MIGDBSetAutoSolib; import org.eclipse.cdt.debug.mi.core.command.MIGDBSetAutoSolib;
import org.eclipse.cdt.debug.mi.core.command.MIGDBSetSolibSearchPath; import org.eclipse.cdt.debug.mi.core.command.MIGDBSetSolibSearchPath;
import org.eclipse.cdt.debug.mi.core.command.MIGDBSetStopOnSolibEvents; import org.eclipse.cdt.debug.mi.core.command.MIGDBSetStopOnSolibEvents;
import org.eclipse.cdt.debug.mi.core.command.MIGDBShow; import org.eclipse.cdt.debug.mi.core.command.MIGDBShow;
import org.eclipse.cdt.debug.mi.core.command.MIGDBShowSolibSearchPath; import org.eclipse.cdt.debug.mi.core.command.MIGDBShowSolibSearchPath;
import org.eclipse.cdt.debug.mi.core.command.CLIInfoSharedLibrary;
import org.eclipse.cdt.debug.mi.core.command.CLISharedLibrary;
import org.eclipse.cdt.debug.mi.core.event.MIBreakpointCreatedEvent; import org.eclipse.cdt.debug.mi.core.event.MIBreakpointCreatedEvent;
import org.eclipse.cdt.debug.mi.core.event.MIEvent; import org.eclipse.cdt.debug.mi.core.event.MIEvent;
import org.eclipse.cdt.debug.mi.core.event.MISharedLibChangedEvent; import org.eclipse.cdt.debug.mi.core.event.MISharedLibChangedEvent;
import org.eclipse.cdt.debug.mi.core.event.MISharedLibCreatedEvent; import org.eclipse.cdt.debug.mi.core.event.MISharedLibCreatedEvent;
import org.eclipse.cdt.debug.mi.core.event.MISharedLibUnloadedEvent; import org.eclipse.cdt.debug.mi.core.event.MISharedLibUnloadedEvent;
import org.eclipse.cdt.debug.mi.core.output.CLIInfoSharedLibraryInfo;
import org.eclipse.cdt.debug.mi.core.output.MIBreakpoint; import org.eclipse.cdt.debug.mi.core.output.MIBreakpoint;
import org.eclipse.cdt.debug.mi.core.output.MIGDBShowInfo; import org.eclipse.cdt.debug.mi.core.output.MIGDBShowInfo;
import org.eclipse.cdt.debug.mi.core.output.MIGDBShowSolibSearchPathInfo; import org.eclipse.cdt.debug.mi.core.output.MIGDBShowSolibSearchPathInfo;
import org.eclipse.cdt.debug.mi.core.output.MIInfo; import org.eclipse.cdt.debug.mi.core.output.MIInfo;
import org.eclipse.cdt.debug.mi.core.output.CLIInfoSharedLibraryInfo;
import org.eclipse.cdt.debug.mi.core.output.MIShared; import org.eclipse.cdt.debug.mi.core.output.MIShared;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
/** /**
* Manager of the CDI shared libraries. * Manager of the CDI shared libraries.
@ -59,11 +64,13 @@ public class SharedLibraryManager extends Manager {
ICDISharedLibrary[] EMPTY_SHAREDLIB = {}; ICDISharedLibrary[] EMPTY_SHAREDLIB = {};
Map sharedMap; Map sharedMap;
Set autoLoadSet;
boolean isDeferred = true; boolean isDeferred = true;
public SharedLibraryManager (Session session) { public SharedLibraryManager (Session session) {
super(session, true); super(session, true);
sharedMap = new Hashtable(); sharedMap = new Hashtable();
autoLoadSet = new HashSet();
setAutoUpdate( MIPlugin.getDefault().getPluginPreferences().getBoolean( IMIConstants.PREF_SHARED_LIBRARIES_AUTO_REFRESH ) ); setAutoUpdate( MIPlugin.getDefault().getPluginPreferences().getBoolean( IMIConstants.PREF_SHARED_LIBRARIES_AUTO_REFRESH ) );
} }
@ -152,6 +159,7 @@ public class SharedLibraryManager extends Manager {
} }
MIShared[] miLibs = getMIShareds(miSession); MIShared[] miLibs = getMIShareds(miSession);
ArrayList newLibList = new ArrayList();
ArrayList eventList = new ArrayList(miLibs.length); ArrayList eventList = new ArrayList(miLibs.length);
for (int i = 0; i < miLibs.length; i++) { for (int i = 0; i < miLibs.length; i++) {
SharedLibrary sharedlib = getSharedLibrary(target, miLibs[i].getName()); SharedLibrary sharedlib = getSharedLibrary(target, miLibs[i].getName());
@ -164,7 +172,9 @@ public class SharedLibraryManager extends Manager {
} else { } else {
// add the new breakpoint and fire CreatedEvent // add the new breakpoint and fire CreatedEvent
List sharedList = getSharedList(target); List sharedList = getSharedList(target);
sharedList.add(new SharedLibrary(target, miLibs[i])); SharedLibrary lib = new SharedLibrary(target, miLibs[i]);
sharedList.add(lib);
newLibList.add(lib);
eventList.add(new MISharedLibCreatedEvent(miSession, miLibs[i].getName())); eventList.add(new MISharedLibCreatedEvent(miSession, miLibs[i].getName()));
} }
} }
@ -186,6 +196,7 @@ public class SharedLibraryManager extends Manager {
} }
} }
} }
eventList.addAll(autoLoadSymbols(target, (SharedLibrary[])newLibList.toArray(new SharedLibrary[newLibList.size()])));
return eventList; return eventList;
} }
@ -364,17 +375,41 @@ public class SharedLibraryManager extends Manager {
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager#supportsAutoLoadSymbols()
*/
public boolean supportsAutoLoadSymbols() { public boolean supportsAutoLoadSymbols() {
return true; return true;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager#supportsStopOnSolibEvents()
*/
public boolean supportsStopOnSolibEvents() { public boolean supportsStopOnSolibEvents() {
return true; return true;
} }
public void autoLoadSymbols( File[] libs ) {
autoLoadSet.addAll( Arrays.asList( libs ) );
}
private List autoLoadSymbols(Target target, SharedLibrary[] libs) throws CDIException {
ArrayList eventList = new ArrayList(libs.length);
MISession miSession = target.getMISession();
CommandFactory factory = miSession.getCommandFactory();
for (int i = 0; i < libs.length; i++) {
IPath path = new Path( libs[i].getFileName() );
File file = new File( path.lastSegment() );
if (libs[i].areSymbolsLoaded() || !autoLoadSet.contains(file)) {
continue;
}
CLISharedLibrary sharedlibrary = factory.createCLISharedLibrary(libs[i].getFileName());
try {
miSession.postCommand(sharedlibrary);
MIInfo info = sharedlibrary.getMIInfo();
if (info == null) {
throw new CDIException(CdiResources.getString("cdi.Common.No_answer")); //$NON-NLS-1$
}
} catch (MIException e) {
throw new MI2CDIException(e);
}
libs[i].getMIShared().setSymbolsRead( true );
eventList.add(new MISharedLibChangedEvent(miSession, libs[i].getFileName()));
}
return eventList;
}
} }

7
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java
View file

@ -12,6 +12,7 @@ package org.eclipse.cdt.debug.mi.core;
import java.io.File; import java.io.File;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
@ -217,6 +218,12 @@ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger {
System.arraycopy( oldPaths, 0, paths, p.size(), oldPaths.length ); System.arraycopy( oldPaths, 0, paths, p.size(), oldPaths.length );
sharedMgr.setSharedLibraryPaths( target, paths ); sharedMgr.setSharedLibraryPaths( target, paths );
} }
// use file names instead of full paths
File[] autoSolibs = MICoreUtils.getAutoSolibs( config );
ArrayList libs = new ArrayList( autoSolibs.length );
for ( int j = 0; j < autoSolibs.length; ++j )
libs.add( new File( autoSolibs[j].getName() ) );
sharedMgr.autoLoadSymbols( (File[])libs.toArray( new File[libs.size()] ) );
} }
} }
catch( CDIException e ) { catch( CDIException e ) {

5
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/IMILaunchConfigurationConstants.java
View file

@ -38,6 +38,11 @@ public interface IMILaunchConfigurationConstants {
*/ */
public static final String ATTR_DEBUGGER_SOLIB_PATH = MIPlugin.getUniqueIdentifier() + ".SOLIB_PATH"; //$NON-NLS-1$ public static final String ATTR_DEBUGGER_SOLIB_PATH = MIPlugin.getUniqueIdentifier() + ".SOLIB_PATH"; //$NON-NLS-1$
/**
* Launch configuration attribute key. The value is a List (array of String) of shared libraries to load symbols automatically.
*/
public static final String ATTR_DEBUGGER_AUTO_SOLIB_LIST = MIPlugin.getUniqueIdentifier() + ".AUTO_SOLIB_LIST"; //$NON-NLS-1$
/** /**
* Launch configuration attribute value. The key is ATTR_DEBUG_NAME. * Launch configuration attribute value. The key is ATTR_DEBUG_NAME.
*/ */

35
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MICoreUtils.java Normal file
View file

@ -0,0 +1,35 @@
/*******************************************************************************
* Copyright (c) 2004 QNX Software Systems 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:
* QNX Software Systems - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.debug.mi.core;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfiguration;
/**
* Utility methods.
*/
public class MICoreUtils {
public static File[] getAutoSolibs( ILaunchConfiguration configuration ) throws CoreException {
List autoSolibs = configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB_LIST, Collections.EMPTY_LIST );
List list = new ArrayList( autoSolibs.size() );
Iterator it = autoSolibs.iterator();
while( it.hasNext() ) {
list.add( new File( (String)it.next() ) );
}
return (File[])list.toArray( new File[list.size()] );
}
}

10
debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
View file

@ -1,3 +1,13 @@
2006-04-10 Mikhail Khodjaiants
Bug 119740: allow to specify only a subset of shared objects that we want symbols to be loaded for.
* MANIFEST.MF
* GDBDebuggerPage.java
* MIUIMessages.properties
* SolibSearchPathBlock.java
* StandardGDBDebuggerPage.java
- IPathProvider.java
* MIUIUtils.java
2006-03-31 Mikhail Khodjaiants 2006-03-31 Mikhail Khodjaiants
Replaced internal org.eclipse.cdt.debug.internal.ui.SWTUtil class. Replaced internal org.eclipse.cdt.debug.internal.ui.SWTUtil class.
+ SWTUtil.java + SWTUtil.java

1
debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
View file

@ -17,6 +17,7 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.cdt.debug.mi.core, org.eclipse.cdt.debug.mi.core,
org.eclipse.cdt.debug.ui, org.eclipse.cdt.debug.ui,
org.eclipse.cdt.debug.core, org.eclipse.cdt.debug.core,
org.eclipse.cdt.core,
org.eclipse.cdt.ui, org.eclipse.cdt.ui,
org.eclipse.debug.core, org.eclipse.debug.core,
org.eclipse.debug.ui, org.eclipse.debug.ui,

2
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/GDBDebuggerPage.java
View file

@ -172,7 +172,7 @@ public class GDBDebuggerPage extends AbstractCDebuggerPage implements Observer {
} }
public IMILaunchConfigurationComponent createSolibBlock( Composite parent ) { public IMILaunchConfigurationComponent createSolibBlock( Composite parent ) {
IMILaunchConfigurationComponent block = MIUIUtils.createGDBSolibBlock( MIUIUtils.createSolibSearchPathBlock( null ), true, true ); IMILaunchConfigurationComponent block = MIUIUtils.createGDBSolibBlock( true, true );
block.createControl( parent ); block.createControl( parent );
return block; return block;
} }

5
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIMessages.properties
View file

@ -60,8 +60,11 @@ SolibSearchPathBlock.2=Down
SolibSearchPathBlock.3=Remove SolibSearchPathBlock.3=Remove
SolibSearchPathBlock.4=Directories: SolibSearchPathBlock.4=Directories:
SolibSearchPathBlock.5=Select directory that contains shared library. SolibSearchPathBlock.5=Select directory that contains shared library.
SolibSearchPathBlock.6=Select From List
SolibSearchPathBlock.7=Select Libraries
SolibSearchPathBlock.8=Select libraries to load symbols automatically.
SolibSearchPathBlock.9=No libraries found.
SolibSearchPathBlock.Add_Directory=Add Directory SolibSearchPathBlock.Add_Directory=Add Directory
SolibSearchPathBlock.Auto=Auto
TCPSettingsBlock.0=Host name or IP address: TCPSettingsBlock.0=Host name or IP address:
TCPSettingsBlock.1=Port number: TCPSettingsBlock.1=Port number:
TCPSettingsBlock.2=Host name or IP address must be specified. TCPSettingsBlock.2=Host name or IP address must be specified.

329
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/SolibSearchPathBlock.java
View file

@ -10,27 +10,48 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.mi.internal.ui; package org.eclipse.cdt.debug.mi.internal.ui;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Observable; import java.util.Observable;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.IBinaryParser;
import org.eclipse.cdt.core.ICExtensionReference;
import org.eclipse.cdt.core.IBinaryParser.IBinaryFile;
import org.eclipse.cdt.core.IBinaryParser.IBinaryShared;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants; import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
import org.eclipse.cdt.debug.mi.core.MICoreUtils;
import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.DialogField; import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.DialogField;
import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.IListAdapter; import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.IListAdapter;
import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.LayoutUtil; import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.LayoutUtil;
import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.ListDialogField; import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.ListDialogField;
import org.eclipse.cdt.debug.mi.ui.IMILaunchConfigurationComponent; import org.eclipse.cdt.debug.mi.ui.IMILaunchConfigurationComponent;
import org.eclipse.cdt.debug.mi.ui.IPathProvider;
import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.ModifyListener;
@ -44,6 +65,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
/** /**
* The UI component to access the shared libraries search path. * The UI component to access the shared libraries search path.
@ -56,7 +78,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
private Button fBrowseButton; private Button fBrowseButton;
private String fValue; private IPath fValue;
/** /**
* Constructor for AddDirectoryDialog. * Constructor for AddDirectoryDialog.
@ -110,12 +132,12 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
newShell.setText( MIUIMessages.getString( "SolibSearchPathBlock.Add_Directory" ) ); //$NON-NLS-1$ newShell.setText( MIUIMessages.getString( "SolibSearchPathBlock.Add_Directory" ) ); //$NON-NLS-1$
} }
public String getValue() { public IPath getValue() {
return fValue; return fValue;
} }
private void setValue( String value ) { private void setValue( String value ) {
fValue = value; fValue = ( value != null ) ? new Path( value ) : null;
} }
protected void buttonPressed( int buttonId ) { protected void buttonPressed( int buttonId ) {
@ -162,37 +184,67 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
buttonPressed( index ); buttonPressed( index );
return result; return result;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.debug.mi.internal.ui.dialogfields.ListDialogField#getManagedButtonState(org.eclipse.jface.viewers.ISelection, int)
*/
protected boolean getManagedButtonState( ISelection sel, int index ) {
if ( index > 3 )
return getButtonState( sel, index );
return super.getManagedButtonState( sel, index );
}
} }
private static String[] fgStaticButtonLabels = new String[] {
MIUIMessages.getString( "SolibSearchPathBlock.0" ), //$NON-NLS-1$
MIUIMessages.getString( "SolibSearchPathBlock.1" ), //$NON-NLS-1$
MIUIMessages.getString( "SolibSearchPathBlock.2" ), //$NON-NLS-1$
MIUIMessages.getString( "SolibSearchPathBlock.3" ), //$NON-NLS-1$
MIUIMessages.getString( "SolibSearchPathBlock.6" ), //$NON-NLS-1$
null, // separator
};
private IProject fProject;
private Shell fShell; private Shell fShell;
private SolibSearchPathListDialogField fDirList; private SolibSearchPathListDialogField fDirList;
private IPathProvider fPathProvider;
public SolibSearchPathBlock( IPathProvider pathProvider ) { private IListAdapter fCustomListAdapter;
private File[] fAutoSolibs = new File[0];
public SolibSearchPathBlock() {
this( new String[0], null );
}
public SolibSearchPathBlock( String[] customButtonLabels, IListAdapter customListAdapter ) {
super(); super();
setPathProvider( pathProvider ); fCustomListAdapter = customListAdapter;
int length = ( getPathProvider() != null ) ? 6 : 4; int length = fgStaticButtonLabels.length;
if ( customButtonLabels.length > 0 )
length += customButtonLabels.length;
String[] buttonLabels = new String[length]; String[] buttonLabels = new String[length];
buttonLabels[0] = MIUIMessages.getString( "SolibSearchPathBlock.0" ); //$NON-NLS-1$ System.arraycopy( fgStaticButtonLabels, 0, buttonLabels, 0, fgStaticButtonLabels.length );
buttonLabels[1] = MIUIMessages.getString( "SolibSearchPathBlock.1" ); //$NON-NLS-1$ if ( length > fgStaticButtonLabels.length ) {
buttonLabels[2] = MIUIMessages.getString( "SolibSearchPathBlock.2" ); //$NON-NLS-1$ for ( int i = fgStaticButtonLabels.length; i < length; ++i )
buttonLabels[3] = MIUIMessages.getString( "SolibSearchPathBlock.3" ); //$NON-NLS-1$ buttonLabels[i] = customButtonLabels[i - fgStaticButtonLabels.length];
if ( buttonLabels.length == 6 ) {
buttonLabels[4] = null;
buttonLabels[5] = MIUIMessages.getString( "SolibSearchPathBlock.Auto" ); //$NON-NLS-1$
} }
IListAdapter listAdapter = new IListAdapter() { IListAdapter listAdapter = new IListAdapter() {
public void customButtonPressed( DialogField field, int index ) { public void customButtonPressed( DialogField field, int index ) {
buttonPressed( index ); buttonPressed( index );
} }
public void selectionChanged( DialogField field ) { public void selectionChanged( DialogField field ) {
} }
}; };
fDirList = new SolibSearchPathListDialogField( listAdapter, buttonLabels, new LabelProvider() ); ILabelProvider lp = new LabelProvider() {
public String getText( Object element ) {
if ( element instanceof IPath )
return ((IPath)element).toOSString();
return super.getText( element );
}
};
fDirList = new SolibSearchPathListDialogField( listAdapter, buttonLabels, lp );
fDirList.setLabelText( MIUIMessages.getString( "SolibSearchPathBlock.4" ) ); //$NON-NLS-1$ fDirList.setLabelText( MIUIMessages.getString( "SolibSearchPathBlock.4" ) ); //$NON-NLS-1$
fDirList.setUpButtonIndex( 1 ); fDirList.setUpButtonIndex( 1 );
fDirList.setDownButtonIndex( 2 ); fDirList.setDownButtonIndex( 2 );
@ -221,13 +273,39 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
* @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration) * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
*/ */
public void initializeFrom( ILaunchConfiguration configuration ) { public void initializeFrom( ILaunchConfiguration configuration ) {
IProject project = null;
try {
String projectName = configuration.getAttribute( ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null );
if ( projectName != null ) {
projectName = projectName.trim();
if ( projectName.length() > 0 ) {
project = ResourcesPlugin.getWorkspace().getRoot().getProject( projectName );
}
}
}
catch( CoreException e ) {
}
setProject( project );
if ( fDirList != null ) { if ( fDirList != null ) {
try { try {
fDirList.addElements( configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST ) ); List values = configuration.getAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST );
ArrayList paths = new ArrayList( values.size() );
Iterator it = values.iterator();
while( it.hasNext() ) {
paths.add( new Path( (String)it.next() ) );
}
fDirList.addElements( paths );
} }
catch( CoreException e ) { catch( CoreException e ) {
} }
} }
try {
fAutoSolibs = MICoreUtils.getAutoSolibs( configuration );
}
catch( CoreException e ) {
}
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -242,34 +320,59 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
*/ */
public void performApply( ILaunchConfigurationWorkingCopy configuration ) { public void performApply( ILaunchConfigurationWorkingCopy configuration ) {
if ( fDirList != null ) { if ( fDirList != null ) {
configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, fDirList.getElements() ); List elements = fDirList.getElements();
ArrayList values = new ArrayList( elements.size() );
Iterator it = elements.iterator();
while( it.hasNext() ) {
values.add( ((IPath)it.next()).toOSString() );
}
configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, values );
} }
ArrayList autoLibs = new ArrayList( fAutoSolibs.length );
for ( int i = 0; i < fAutoSolibs.length; ++i )
autoLibs.add( fAutoSolibs[i].getPath() );
configuration.setAttribute( IMILaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB_LIST, autoLibs );
} }
protected void buttonPressed( int index ) { protected void buttonPressed( int index ) {
switch( index ) { boolean changed = false;
case 0: if ( index == 0 ) { // Add button
addDirectory(); changed = addDirectory();
break;
case 5:
generatePaths();
break;
} }
setChanged(); else if ( index == 4 ) { //Select from list
notifyObservers(); changed = selectFromList();
}
else if ( index >= fgStaticButtonLabels.length && fCustomListAdapter != null ) {
fCustomListAdapter.customButtonPressed( fDirList, index );
changed = true;
}
if ( changed ) {
setChanged();
notifyObservers();
}
}
protected boolean getButtonState( ISelection sel, int index ) {
if ( index == 4 ) { // select from list
return ( !sel.isEmpty() );
}
return true;
} }
protected Shell getShell() { protected Shell getShell() {
return fShell; return fShell;
} }
private void addDirectory() { private boolean addDirectory() {
boolean changed = false;
AddDirectoryDialog dialog = new AddDirectoryDialog( getShell() ); AddDirectoryDialog dialog = new AddDirectoryDialog( getShell() );
dialog.open(); dialog.open();
String result = dialog.getValue(); IPath result = dialog.getValue();
if ( result != null && !contains( result ) ) { if ( result != null && !contains( result ) ) {
fDirList.addElement( result.trim() ); fDirList.addElement( result );
changed = true;
} }
return changed;
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -294,44 +397,146 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
return false; return false;
} }
private void generatePaths() {
IPathProvider pp = getPathProvider();
if ( pp != null ) {
IPath[] dirs = pp.getPaths();
for ( int i = 0; i < dirs.length; ++i )
if ( !contains( dirs[i] ) )
fDirList.addElement( dirs[i].toOSString() );
}
}
private IPathProvider getPathProvider() {
return fPathProvider;
}
private void setPathProvider( IPathProvider pathProvider ) {
fPathProvider = pathProvider;
}
private boolean contains( IPath path ) { private boolean contains( IPath path ) {
List list = fDirList.getElements(); List list = fDirList.getElements();
Iterator it = list.iterator(); Iterator it = list.iterator();
while( it.hasNext() ) { while( it.hasNext() ) {
IPath p = new Path( (String)it.next() ); IPath p = (IPath)it.next();
if ( p.toFile().compareTo( path.toFile() ) == 0 ) if ( p.toFile().equals( path.toFile() ) )
return true; return true;
} }
return false; return false;
} }
private boolean contains( String dir ) { protected IProject getProject() {
IPath path = new Path( dir ); return fProject;
List list = fDirList.getElements(); }
Iterator it = list.iterator();
while( it.hasNext() ) { private void setProject( IProject project ) {
IPath p = new Path( (String)it.next() ); fProject = project;
if ( p.toFile().compareTo( path.toFile() ) == 0 ) }
return true;
protected boolean selectFromList() {
boolean changed = false;
List dirList = fDirList.getSelectedElements();
final ArrayList libs = new ArrayList( 10 );
if ( generateLibraryList( (IPath[])dirList.toArray( new IPath[dirList.size()] ), libs ) ) {
ITreeContentProvider cp = new ITreeContentProvider() {
public Object[] getChildren( Object parentElement ) {
return getElements( parentElement );
}
public Object getParent( Object element ) {
if ( libs.contains( element ) )
return libs;
return null;
}
public boolean hasChildren( Object element ) {
return false;
}
public Object[] getElements( Object inputElement ) {
if ( inputElement instanceof List ) {
return ((List)inputElement).toArray();
}
return new Object[0];
}
public void dispose() {
}
public void inputChanged( Viewer viewer, Object oldInput, Object newInput ) {
}
};
LabelProvider lp = new LabelProvider() {
public String getText( Object element ) {
if ( element instanceof File )
return ((File)element).getName();
return super.getText( element );
}
};
CheckedTreeSelectionDialog dialog = new CheckedTreeSelectionDialog( getShell(), lp, cp );
dialog.setTitle( MIUIMessages.getString( "SolibSearchPathBlock.7" ) ); //$NON-NLS-1$
dialog.setMessage( MIUIMessages.getString( "SolibSearchPathBlock.8" ) ); //$NON-NLS-1$
dialog.setEmptyListMessage( MIUIMessages.getString( "SolibSearchPathBlock.9" ) ); //$NON-NLS-1$
dialog.setInput( libs );
dialog.setInitialElementSelections( Arrays.asList( fAutoSolibs ) );
if ( dialog.open() == Window.OK ) {
Object[] result = dialog.getResult();
fAutoSolibs = (File[])Arrays.asList( result ).toArray( new File[result.length] );
changed = true;
}
} }
return false; return changed;
}
private boolean generateLibraryList( final IPath[] paths, final List libs ) {
boolean result = true;
IRunnableWithProgress runnable = new IRunnableWithProgress() {
public void run( IProgressMonitor monitor ) throws InvocationTargetException, InterruptedException {
for ( int i = 0; i < paths.length; ++i ) {
File dir = paths[i].toFile();
if ( dir.exists() && dir.isDirectory() ) {
File[] all = dir.listFiles();
for ( int j = 0; j < all.length; ++j ) {
if ( monitor.isCanceled() ) {
throw new InterruptedException();
}
monitor.subTask( all[j].getPath() );
if ( isSharedLibrary( all[j] ) ) {
libs.add( all[j] );
}
}
}
}
}
};
try {
IRunnableContext context = new ProgressMonitorDialog( getShell() );
context.run( true, true, runnable );
}
catch( InvocationTargetException e ) {
}
catch( InterruptedException e ) {
result = false;
}
return result;
}
protected boolean isSharedLibrary( File file ) {
if ( !file.isFile() )
return false;
IProject project = getProject();
if ( project != null ) {
IPath fullPath = new Path( file.getPath() );
try {
ICExtensionReference[] binaryParsersExt = CCorePlugin.getDefault().getBinaryParserExtensions( project );
for( int i = 0; i < binaryParsersExt.length; i++ ) {
IBinaryParser parser = (IBinaryParser)binaryParsersExt[i].createExtension();
try {
IBinaryFile bin = parser.getBinary( fullPath );
return ( bin instanceof IBinaryShared );
}
catch( IOException e ) {
}
}
}
catch( CoreException e ) {
}
return false;
}
// no project: for now
IPath path = new Path( file.getPath() );
String extension = path.getFileExtension();
if ( extension != null && (extension.compareTo( "so" ) == 0 || extension.compareToIgnoreCase( "dll" ) == 0) ) //$NON-NLS-1$ //$NON-NLS-2$
return true;
String name = path.lastSegment();
return ( name.indexOf( ".so." ) >= 0 ); //$NON-NLS-1$
} }
} }

2
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/StandardGDBDebuggerPage.java
View file

@ -207,7 +207,7 @@ public class StandardGDBDebuggerPage extends AbstractCDebuggerPage implements Ob
} }
public IMILaunchConfigurationComponent createSolibBlock( Composite parent ) { public IMILaunchConfigurationComponent createSolibBlock( Composite parent ) {
IMILaunchConfigurationComponent block = MIUIUtils.createGDBSolibBlock( MIUIUtils.createSolibSearchPathBlock( null ), true, true ); IMILaunchConfigurationComponent block = MIUIUtils.createGDBSolibBlock( true, true );
block.createControl( parent ); block.createControl( parent );
return block; return block;
} }

20
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/IPathProvider.java
View file

@ -1,20 +0,0 @@
/*******************************************************************************
* Copyright (c) 2004 QNX Software Systems 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:
* QNX Software Systems - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.debug.mi.ui;
import org.eclipse.core.runtime.IPath;
/**
* Comment for .
*/
public interface IPathProvider {
public IPath[] getPaths();
}

13
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/ui/MIUIUtils.java
View file

@ -12,19 +12,22 @@ package org.eclipse.cdt.debug.mi.ui;
import org.eclipse.cdt.debug.mi.internal.ui.GDBSolibBlock; import org.eclipse.cdt.debug.mi.internal.ui.GDBSolibBlock;
import org.eclipse.cdt.debug.mi.internal.ui.SolibSearchPathBlock; import org.eclipse.cdt.debug.mi.internal.ui.SolibSearchPathBlock;
import org.eclipse.cdt.debug.mi.internal.ui.dialogfields.IListAdapter;
/** /**
* This class provides utilities for clients of the MI UI. * This class provides utilities for clients of the MI UI.
*/ */
public class MIUIUtils { public class MIUIUtils {
public static IMILaunchConfigurationComponent createGDBSolibBlock( IMILaunchConfigurationComponent solibSearchBlock, public static IMILaunchConfigurationComponent createGDBSolibBlock( IMILaunchConfigurationComponent solibSearchBlock, boolean autoSolib, boolean stopOnSolibEvents ) {
boolean autoSolib,
boolean stopOnSolibEvents ) {
return new GDBSolibBlock( solibSearchBlock, autoSolib, stopOnSolibEvents ); return new GDBSolibBlock( solibSearchBlock, autoSolib, stopOnSolibEvents );
} }
public static IMILaunchConfigurationComponent createSolibSearchPathBlock( IPathProvider pp ) { public static IMILaunchConfigurationComponent createGDBSolibBlock( boolean autoSolib, boolean stopOnSolibEvents ) {
return new SolibSearchPathBlock( pp ); return new GDBSolibBlock( new SolibSearchPathBlock(), autoSolib, stopOnSolibEvents );
}
public static IMILaunchConfigurationComponent createSolibSearchPathBlock( String[] customButtonLabels, IListAdapter listAdapter ) {
return new SolibSearchPathBlock( customButtonLabels, listAdapter );
} }
} }