mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-11 10:15:39 +02:00
Code Issues Wiki Activity

Improve robustness of the full and fast indexers. If Throwables are detected, the current file or name is skipped. This continues until a maximums is reached in which case the index job is aborted.

Browse source
This commit is contained in:
Doug Schaefer 2006-05-11 20:17:00 +00:00
parent 9db611cefe
commit 37c5d87fec
6 changed files with 59 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastHandleDelta.java
View file

@ -60,7 +60,13 @@ class PDOMFastHandleDelta extends PDOMFastIndexerJob {
while (i.hasNext()) { while (i.hasNext()) {
ITranslationUnit tu = (ITranslationUnit)i.next(); ITranslationUnit tu = (ITranslationUnit)i.next();
monitor.subTask(tu.getElementName()); monitor.subTask(tu.getElementName());
changeTU(tu); try {
changeTU(tu);
} catch (Throwable e) {
CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
return Status.CANCEL_STATUS;
}
monitor.worked(1); monitor.worked(1);
} }
@ -68,7 +74,13 @@ class PDOMFastHandleDelta extends PDOMFastIndexerJob {
while (i.hasNext()) { while (i.hasNext()) {
ITranslationUnit tu = (ITranslationUnit)i.next(); ITranslationUnit tu = (ITranslationUnit)i.next();
monitor.subTask(tu.getElementName()); monitor.subTask(tu.getElementName());
addTU(tu); try {
addTU(tu);
} catch (Throwable e) {
CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
return Status.CANCEL_STATUS;
}
monitor.worked(1); monitor.worked(1);
} }

14
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastIndexerJob.java
View file

@ -39,6 +39,10 @@ public abstract class PDOMFastIndexerJob extends Job {
protected final Map fileMap = new HashMap(); protected final Map fileMap = new HashMap();
protected final PDOM pdom; protected final PDOM pdom;
// Error counter. If we too many errors we bail
protected int errorCount;
protected final int MAX_ERRORS = 10;
public PDOMFastIndexerJob(PDOM pdom) { public PDOMFastIndexerJob(PDOM pdom) {
super("Fast Indexer: " + pdom.getProject().getElementName()); super("Fast Indexer: " + pdom.getProject().getElementName());
this.pdom = pdom; this.pdom = pdom;
@ -121,18 +125,18 @@ public abstract class PDOMFastIndexerJob extends Job {
shouldVisitNames = true; shouldVisitNames = true;
shouldVisitDeclarations = true; shouldVisitDeclarations = true;
} }
public int visit(IASTName name) { public int visit(IASTName name) {
try { try {
IASTFileLocation nameLoc = name.getFileLocation(); IASTFileLocation nameLoc = name.getFileLocation();
if (nameLoc != null) if (nameLoc != null)
linkage.addName(name, getCachedFile(nameLoc.getFileName())); linkage.addName(name, getCachedFile(nameLoc.getFileName()));
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
} catch (CoreException e) { } catch (Throwable e) {
CCorePlugin.log(e); CCorePlugin.log(e);
return PROCESS_ABORT; return ++errorCount > MAX_ERRORS ? PROCESS_ABORT : PROCESS_CONTINUE;
} }
}; }
});; });
} }
} }

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastReindex.java
View file

@ -72,8 +72,10 @@ public class PDOMFastReindex extends PDOMFastIndexerJob {
monitor.subTask(tu.getElementName()); monitor.subTask(tu.getElementName());
try { try {
addTU(tu); addTU(tu);
} catch (InterruptedException e) { } catch (Throwable e) {
throw new CoreException(Status.CANCEL_STATUS); CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
throw new CoreException(Status.CANCEL_STATUS);
} }
monitor.worked(1); monitor.worked(1);
} }
@ -101,8 +103,10 @@ public class PDOMFastReindex extends PDOMFastIndexerJob {
monitor.subTask(tu.getElementName()); monitor.subTask(tu.getElementName());
try { try {
addTU(tu); addTU(tu);
} catch (InterruptedException e) { } catch (Throwable e) {
throw new CoreException(Status.CANCEL_STATUS); CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
throw new CoreException(Status.CANCEL_STATUS);
} }
} }
monitor.worked(1); monitor.worked(1);

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullHandleDelta.java
View file

@ -70,7 +70,13 @@ public class PDOMFullHandleDelta extends PDOMFullIndexerJob {
while (i.hasNext()) { while (i.hasNext()) {
ITranslationUnit tu = (ITranslationUnit)i.next(); ITranslationUnit tu = (ITranslationUnit)i.next();
monitor.subTask(tu.getElementName()); monitor.subTask(tu.getElementName());
changeTU(tu); try {
changeTU(tu);
} catch (Throwable e) {
CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
return Status.CANCEL_STATUS;
}
monitor.worked(1); monitor.worked(1);
} }
@ -78,7 +84,13 @@ public class PDOMFullHandleDelta extends PDOMFullIndexerJob {
while (i.hasNext()) { while (i.hasNext()) {
ITranslationUnit tu = (ITranslationUnit)i.next(); ITranslationUnit tu = (ITranslationUnit)i.next();
monitor.subTask(tu.getElementName()); monitor.subTask(tu.getElementName());
addTU(tu); try {
addTU(tu);
} catch (Throwable e) {
CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
return Status.CANCEL_STATUS;
}
monitor.worked(1); monitor.worked(1);
} }

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullIndexerJob.java
View file

@ -34,6 +34,10 @@ public abstract class PDOMFullIndexerJob extends Job {
protected final PDOM pdom; protected final PDOM pdom;
// Error count, bail when it gets too high
protected int errorCount;
protected final int MAX_ERRORS = 10;
public PDOMFullIndexerJob(PDOM pdom) { public PDOMFullIndexerJob(PDOM pdom) {
super("Full Indexer: " + pdom.getProject().getElementName()); super("Full Indexer: " + pdom.getProject().getElementName());
this.pdom = pdom; this.pdom = pdom;
@ -113,9 +117,9 @@ public abstract class PDOMFullIndexerJob extends Job {
linkage.addName(name, file); linkage.addName(name, file);
} }
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
} catch (CoreException e) { } catch (Throwable e) {
CCorePlugin.log(e); CCorePlugin.log(e);
return PROCESS_ABORT; return ++errorCount > MAX_ERRORS ? PROCESS_ABORT : PROCESS_CONTINUE;
} }
}; };
});; });;

10
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/full/PDOMFullReindex.java
View file

@ -72,8 +72,10 @@ public class PDOMFullReindex extends PDOMFullIndexerJob {
monitor.subTask(tu.getElementName()); monitor.subTask(tu.getElementName());
try { try {
addTU(tu); addTU(tu);
} catch (InterruptedException e) { } catch (Throwable e) {
throw new CoreException(Status.CANCEL_STATUS); CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
throw new CoreException(Status.CANCEL_STATUS);
} }
monitor.worked(1); monitor.worked(1);
} }
@ -102,7 +104,9 @@ public class PDOMFullReindex extends PDOMFullIndexerJob {
try { try {
addTU(tu); addTU(tu);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new CoreException(Status.CANCEL_STATUS); CCorePlugin.log(e);
if (++errorCount > MAX_ERRORS)
throw new CoreException(Status.CANCEL_STATUS);
} }
} }
monitor.worked(1); monitor.worked(1);