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

2005-01-06 Chris Wiebe

Browse source 
added parser timeout to TypeParser
	* browser/org/eclipse/cdt/internal/core/browser/cache/TypeParser.java
This commit is contained in:
Chris Wiebe 2005-01-06 21:07:12 +00:00
parent d019346a04
commit c44a67648d
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/browser/ChangeLog-browser
View file

@ -1,3 +1,7 @@
2005-01-06 Chris Wiebe
added parser timeout to TypeParser
* browser/org/eclipse/cdt/internal/core/browser/cache/TypeParser.java
2004-11-08 Chris Wiebe 2004-11-08 Chris Wiebe
fix for 68883 fix for 68883

34
core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeParser.java vendored
View file

@ -49,6 +49,7 @@ import org.eclipse.cdt.core.parser.ParserFactory;
import org.eclipse.cdt.core.parser.ParserFactoryError; import org.eclipse.cdt.core.parser.ParserFactoryError;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ParserTimeOut;
import org.eclipse.cdt.core.parser.ParserUtil; import org.eclipse.cdt.core.parser.ParserUtil;
import org.eclipse.cdt.core.parser.ScannerInfo; import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility; import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
@ -122,10 +123,14 @@ public class TypeParser implements ISourceElementRequestor {
private Set fProcessedTypes = new HashSet(); private Set fProcessedTypes = new HashSet();
private boolean fFoundType; private boolean fFoundType;
IParser fParser = null; IParser fParser = null;
ParserTimeOut fTimeoutThread = null;
public TypeParser(ITypeCache typeCache, IWorkingCopyProvider provider) { public TypeParser(ITypeCache typeCache, IWorkingCopyProvider provider) {
fTypeCache = typeCache; fTypeCache = typeCache;
fWorkingCopyProvider = provider; fWorkingCopyProvider = provider;
fTimeoutThread = new ParserTimeOut("TypeParser TimeOut Thread"); //$NON-NLS-1$
fTimeoutThread.setThreadPriority(Thread.MAX_PRIORITY);
} }
public void parseTypes(TypeSearchScope scope, IProgressMonitor monitor) throws InterruptedException { public void parseTypes(TypeSearchScope scope, IProgressMonitor monitor) throws InterruptedException {
@ -503,6 +508,23 @@ public class TypeParser implements ISourceElementRequestor {
IScanner scanner = ParserFactory.createScanner(reader, scanInfo, IScanner scanner = ParserFactory.createScanner(reader, scanInfo,
ParserMode.STRUCTURAL_PARSE, language, this, ParserUtil.getScannerLogService(), null); ParserMode.STRUCTURAL_PARSE, language, this, ParserUtil.getScannerLogService(), null);
fParser = ParserFactory.createParser(scanner, this, ParserMode.STRUCTURAL_PARSE, language, ParserUtil.getParserLogService()); fParser = ParserFactory.createParser(scanner, this, ParserMode.STRUCTURAL_PARSE, language, ParserUtil.getParserLogService());
// start timer
int timeout = getParserTimeout();
if (timeout > 0) {
fTimeoutThread.setTimeout(timeout);
fTimeoutThread.setParser(fParser);
while (!fTimeoutThread.isReadyToRun()){
try {
Thread.sleep(20);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
fTimeoutThread.startTimer();
}
fParser.parse(); fParser.parse();
} catch (ParserFactoryError e) { } catch (ParserFactoryError e) {
CCorePlugin.log(e); CCorePlugin.log(e);
@ -514,6 +536,9 @@ public class TypeParser implements ISourceElementRequestor {
} catch (Exception e) { } catch (Exception e) {
CCorePlugin.log(e); CCorePlugin.log(e);
} finally { } finally {
// stop timer
fTimeoutThread.stopTimer();
fTimeoutThread.setParser(null);
fProgressMonitor = null; fProgressMonitor = null;
fParser = null; fParser = null;
} }
@ -901,4 +926,11 @@ public class TypeParser implements ISourceElementRequestor {
public CodeReader createReader(String finalPath, Iterator workingCopies) { public CodeReader createReader(String finalPath, Iterator workingCopies) {
return ParserUtil.createReader(finalPath, workingCopies); return ParserUtil.createReader(finalPath, workingCopies);
} }
public int getParserTimeout() {
// here we just reuse the indexer timeout
String timeOut = CCorePlugin.getDefault().getPluginPreferences().getString("CDT_INDEXER_TIMEOUT");
return Integer.valueOf(timeOut).intValue();
}
} }