mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Run indexer on referenced project first (related to bug 162175).

Browse source
This commit is contained in:
Markus Schorn 2007-11-23 14:12:07 +00:00
parent a9bd224f49
commit 7cbba4df75
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
View file

@ -21,7 +21,9 @@ import java.io.OutputStream;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -564,8 +566,25 @@ public class PDOMManager implements IWritableIndexManager, IListener {
} }
public void enqueue(IPDOMIndexerTask subjob) { public void enqueue(IPDOMIndexerTask subjob) {
final HashSet referencing= new HashSet();
final IPDOMIndexer indexer = subjob.getIndexer();
if (indexer != null) {
getReferencingProjects(indexer.getProject().getProject(), referencing);
}
synchronized (fTaskQueueMutex) { synchronized (fTaskQueueMutex) {
int i=0;
for (Iterator it = fTaskQueue.iterator(); it.hasNext();) {
final IPDOMIndexerTask task= (IPDOMIndexerTask) it.next();
final IPDOMIndexer ti = task.getIndexer();
if (ti != null && referencing.contains(ti.getProject().getProject())) {
fTaskQueue.add(i, subjob);
break;
}
i++;
}
if (i == fTaskQueue.size()) {
fTaskQueue.addLast(subjob); fTaskQueue.addLast(subjob);
}
if (fIndexerJob == null) { if (fIndexerJob == null) {
fCompletedSources= 0; fCompletedSources= 0;
fCompletedHeaders= 0; fCompletedHeaders= 0;
@ -577,6 +596,17 @@ public class PDOMManager implements IWritableIndexManager, IListener {
} }
} }
private void getReferencingProjects(IProject prj, HashSet result) {
LinkedList projectsToSearch= new LinkedList();
projectsToSearch.add(prj);
while (!projectsToSearch.isEmpty()) {
prj= (IProject) projectsToSearch.removeFirst();
if (result.add(prj)) {
projectsToSearch.addAll(Arrays.asList(prj.getReferencingProjects()));
}
}
}
IPDOMIndexerTask getNextTask() { IPDOMIndexerTask getNextTask() {
IPDOMIndexerTask result= null; IPDOMIndexerTask result= null;
synchronized (fTaskQueueMutex) { synchronized (fTaskQueueMutex) {