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

223521: fix for race condition encountered in GeneratePDOM.run

Browse source
This commit is contained in:
Andrew Ferguson 2008-05-02 14:54:05 +00:00
parent 3fb7973084
commit 0c05265d7d
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1344,7 +1344,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
}
/**
* @param indexerSetupParticipant
* @param participant
* @param project
*/
public void notifyIndexerSetup(IndexerSetupParticipant participant, ICProject project) {
@ -1369,4 +1369,14 @@ public class PDOMManager implements IWritableIndexManager, IListener {
}
}
}
/**
* @param project
* @return whether the specified project has been registered. If a project has
* been registered, clients can call joinIndexer with the knowledge tasks have
* been enqueued.
*/
public boolean isProjectRegistered(ICProject project) {
return getIndexer(project) != null;
}
}

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java
View file

@ -70,9 +70,11 @@ public class GeneratePDOM implements ISafeRunnable {
try {
final IIndexManager im = CCorePlugin.getIndexManager();
for (int i = 0; i < 20; i++) {
im.joinIndexer(Integer.MAX_VALUE, new NullProgressMonitor());
if (!im.isIndexerSetupPostponed(cproject)) {
break;
if(CCoreInternals.getPDOMManager().isProjectRegistered(cproject)) {
im.joinIndexer(Integer.MAX_VALUE, new NullProgressMonitor());
if (!im.isIndexerSetupPostponed(cproject)) {
break;
}
}
Thread.sleep(200);
}