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

Adjustment to previous fix so that it more likely addresses 291912

Browse source
This commit is contained in:
John Cortell 2009-10-13 20:27:07 +00:00
parent 638311eff9
commit 48a0dbe690
1 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
View file

@ -13,12 +13,10 @@
package org.eclipse.cdt.debug.internal.core.model;
import java.io.File;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
import org.eclipse.cdt.core.CCorePlugin;
@ -89,10 +87,10 @@ import org.eclipse.cdt.debug.core.model.IRegisterDescriptor;
import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
import org.eclipse.cdt.debug.core.sourcelookup.ISourceLookupChangeListener;
import org.eclipse.cdt.debug.internal.core.CBreakpointManager;
import org.eclipse.cdt.debug.internal.core.CSettingsManager;
import org.eclipse.cdt.debug.internal.core.CGlobalVariableManager;
import org.eclipse.cdt.debug.internal.core.CMemoryBlockRetrievalExtension;
import org.eclipse.cdt.debug.internal.core.CRegisterManager;
import org.eclipse.cdt.debug.internal.core.CSettingsManager;
import org.eclipse.cdt.debug.internal.core.CSignalManager;
import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants;
import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupParticipant;
@ -136,6 +134,8 @@ import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer;
import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
import com.ibm.icu.text.MessageFormat;
/**
* Debug target for C/C++ debug model.
*/
@ -1813,8 +1813,11 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
}
private void setSourceLookupPath( ISourceContainer[] containers ) {
ArrayList<String> list = new ArrayList<String>( containers.length );
getSourceLookupPath( list, containers, new HashSet<ISourceContainer>(containers.length) );
// LinkedHashSet allows quick lookup and deterministic ordering. We need
// the former to efficiently prevent infinite recursion
LinkedHashSet<String> list = new LinkedHashSet<String>( containers.length );
getSourceLookupPath( list, containers );
try {
final ICDITarget cdiTarget = getCDITarget();
if (cdiTarget != null) {
@ -1826,39 +1829,41 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
}
}
private void getSourceLookupPath( List<String> list, ISourceContainer[] containers, Set<ISourceContainer> alreadyProcessed ) {
private void getSourceLookupPath( LinkedHashSet<String> list, ISourceContainer[] containers) {
for ( ISourceContainer container : containers ) {
String pathToAdd = null;
// Not sure that this addresses the problem behind 291912 but it's
// easy enough to bullet proof the logic to prevent infinite
// recursion when a source-container instance appears twice in the
// hierarchy
if (alreadyProcessed.contains(container)) {
continue;
}
else {
alreadyProcessed.add(container);
}
if ( container instanceof ProjectSourceContainer ) {
IProject project = ((ProjectSourceContainer)container).getProject();
if ( project != null && project.exists() )
list.add( project.getLocation().toPortableString() );
pathToAdd = project.getLocation().toPortableString();
}
if ( container instanceof FolderSourceContainer ) {
IContainer folderContainer = ((FolderSourceContainer)container).getContainer();
if ( folderContainer != null && folderContainer.exists() )
list.add( folderContainer.getLocation().toPortableString() );
if ( folderContainer != null && folderContainer.exists() ) {
pathToAdd = folderContainer.getLocation().toPortableString();
}
}
if ( container instanceof DirectorySourceContainer ) {
File dir = ((DirectorySourceContainer)container).getDirectory();
if ( dir != null && dir.exists() ) {
IPath path = new Path( dir.getAbsolutePath() );
list.add( path.toPortableString() );
pathToAdd = path.toPortableString();
}
}
if ( pathToAdd != null ) {
// 291912. Avoid infinite recursion
if ( list.contains(pathToAdd) ) {
continue;
}
list.add( pathToAdd );
}
if ( container.isComposite() ) {
try {
getSourceLookupPath( list, container.getSourceContainers(), alreadyProcessed );
getSourceLookupPath( list, container.getSourceContainers() );
}
catch( CoreException e ) {
CDebugCorePlugin.log( e.getStatus() );