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

Bug 342141 - Executables view content goes stale in various scenarios [Discovered inefficiency in new code. There's no need to research a project for executables when we've been able to determine that one or more specific Executable objects were removed. Just update the model and notify listeners.]

Browse source
This commit is contained in:
John Cortell 2011-05-12 17:55:37 +00:00
parent a48a40919f
commit 9612b01db0
1 changed files with 40 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java
View file

@ -74,8 +74,6 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
*/ */
public class ExecutablesManager extends PlatformObject implements ICProjectDescriptionListener, IElementChangedListener, IResourceChangeListener { public class ExecutablesManager extends PlatformObject implements ICProjectDescriptionListener, IElementChangedListener, IResourceChangeListener {
private static final String EXECUTABLES_MANAGER_DEBUG_TRACING = CDebugCorePlugin.PLUGIN_ID + "EXECUTABLES_MANAGER_DEBUG_TRACING"; //$NON-NLS-1$
private Map<IProject, IProjectExecutablesProvider> executablesProviderMap = new HashMap<IProject, IProjectExecutablesProvider>(); private Map<IProject, IProjectExecutablesProvider> executablesProviderMap = new HashMap<IProject, IProjectExecutablesProvider>();
private List<IExecutablesChangeListener> changeListeners = Collections.synchronizedList(new ArrayList<IExecutablesChangeListener>()); private List<IExecutablesChangeListener> changeListeners = Collections.synchronizedList(new ArrayList<IExecutablesChangeListener>());
private List<IProjectExecutablesProvider> executableProviders; private List<IProjectExecutablesProvider> executableProviders;
@ -897,18 +895,29 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr
} }
} }
if (executablesRemoved.size() > 0) { if (executablesRemoved.size() > 0) {
// Update our model (i.e., our collection of Executables) and inform listeners
if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "One or more executables were removed"); //$NON-NLS-1$ if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "One or more executables were removed"); //$NON-NLS-1$
List<Executable> list = Arrays.asList(executablesRemoved.toArray(new Executable[executablesRemoved.size()])); synchronized (executablesMap) {
synchronized (changeListeners) { for (Executable executableRemoved : executablesRemoved) {
for (IExecutablesChangeListener listener : changeListeners) { List<Executable> execs = executablesMap.get(executableRemoved.getProject());
if (listener instanceof IExecutablesChangeListener2) { assert execs != null : "considering the list was used in populating 'executablesRemoved', how could it be gone now?"; //$NON-NLS-1$
((IExecutablesChangeListener2)listener).executablesRemoved(list); if (execs != null) {
execs.remove(executableRemoved);
} }
} }
} }
List<Executable> list = Arrays.asList(executablesRemoved.toArray(new Executable[executablesRemoved.size()]));
synchronized (changeListeners) {
for (IExecutablesChangeListener listener : changeListeners) {
// call newer interface if supported
if (listener instanceof IExecutablesChangeListener2) {
((IExecutablesChangeListener2)listener).executablesRemoved(list);
}
// and call older interface, which is less informative
listener.executablesListChanged();
}
}
} }
return; return;
} }
@ -964,49 +973,35 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr
} }
else if (element instanceof IBinary) { else if (element instanceof IBinary) {
IProject project = cproject.getProject(); IProject project = cproject.getProject();
switch (delta.getKind()) { int deltaKind = delta.getKind();
switch (deltaKind) {
case ICElementDelta.ADDED: case ICElementDelta.ADDED:
projectsToRefresh.add(project); projectsToRefresh.add(project);
break; break;
case ICElementDelta.REMOVED: { case ICElementDelta.REMOVED:
projectsToRefresh.add(project);
List<Executable> execs = null;
synchronized (executablesMap) {
execs = executablesMap.get(project);
}
if (execs != null) {
for (Executable exec : execs) {
if (exec.getResource().equals(delta.getElement().getResource())) {
removedExecutables.add(exec);
break;
}
}
}
// Note that it's not our job to update 'executablesMap'.
// The async exec search job will do that.
break;
}
case ICElementDelta.CHANGED: { case ICElementDelta.CHANGED: {
List<Executable> execs = null; List<Executable> execs = null;
synchronized (executablesMap) { synchronized (executablesMap) {
execs = executablesMap.get(project); execs = executablesMap.get(project);
} if (execs == null) {
if (execs == null) { // Somehow, we missed the addition of the project.
// Somehow, we missed the addition of the // Request that the project be researched for
// project. Request that the project be // executables
// searched for executables projectsToRefresh.add(project);
projectsToRefresh.add(project); }
} else {
else { // See if it's one of the executables we already know
// See if it's one of the executables we // is in the project. If so, we'll update our
// already know is in the project. If // executables map (if removed) and notifying
// so, then we just need to tell // listeners
// listeners the executable changed for (Executable exec : execs) {
for (Executable exec : execs) { if (exec.getResource().equals(delta.getElement().getResource())) {
if (exec.getResource().equals(delta.getElement().getResource())) { if (deltaKind == ICElementDelta.REMOVED)
changedExecutables.add(exec); removedExecutables.add(exec);
break; else
changedExecutables.add(exec);
break;
}
} }
} }
} }