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

Fix computation of time for parser without resolution and index update

Browse source
This commit is contained in:
Markus Schorn 2006-12-05 14:19:30 +00:00
parent dabcfe8c2b
commit e36cb0d76f
1 changed files with 58 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java
View file

@ -338,66 +338,69 @@ public abstract class PDOMIndexerTask implements IPDOMIndexerTask {
protected void addSymbols(IASTTranslationUnit ast, IProgressMonitor pm) throws InterruptedException, CoreException { protected void addSymbols(IASTTranslationUnit ast, IProgressMonitor pm) throws InterruptedException, CoreException {
final Map symbolMap= new HashMap(); final Map symbolMap= new HashMap();
String[] orderedPaths= extractSymbols(ast, symbolMap);
for (int i=0; i<orderedPaths.length; i++) {
if (pm.isCanceled()) {
return;
}
String path= orderedPaths[i];
ArrayList[] arrayLists = ((ArrayList[]) symbolMap.get(path));
// resolve the names
long start= System.currentTimeMillis();
ArrayList names= arrayLists[2];
for (int j=0; j<names.size(); j++) {
final IASTName name = ((IASTName[]) names.get(j))[0];
final IBinding binding= name.resolveBinding();
if (fShowStatistics) {
if (binding instanceof IProblemBinding)
fProblemBindingCount++;
else if (name.isReference())
fReferenceCount++;
else
fDeclarationCount++;
}
}
fResolutionTime += System.currentTimeMillis()-start;
}
boolean isFirstRequest= true;
boolean isFirstAddition= true;
IWritableIndex index= getIndex();
index.acquireWriteLock(getReadlockCount());
long start= System.currentTimeMillis();
try { try {
String[] orderedPaths= extractSymbols(ast, symbolMap);
for (int i=0; i<orderedPaths.length; i++) { for (int i=0; i<orderedPaths.length; i++) {
if (pm.isCanceled()) if (pm.isCanceled()) {
return; return;
String path = orderedPaths[i];
if (path != null) {
if (fTrace) {
System.out.println("Indexer: adding " + path); //$NON-NLS-1$
}
IIndexFile file= addToIndex(index, path, symbolMap);
if (postAddToIndex(path, file)) {
if (isFirstRequest)
isFirstRequest= false;
else
fTotalSourcesEstimate--;
}
if (isFirstAddition)
isFirstAddition= false;
else
fCompletedHeaders++;
} }
String path= orderedPaths[i];
ArrayList[] arrayLists = ((ArrayList[]) symbolMap.get(path));
// resolve the names
long start= System.currentTimeMillis();
ArrayList names= arrayLists[2];
for (int j=0; j<names.size(); j++) {
final IASTName name = ((IASTName[]) names.get(j))[0];
final IBinding binding= name.resolveBinding();
if (fShowStatistics) {
if (binding instanceof IProblemBinding)
fProblemBindingCount++;
else if (name.isReference())
fReferenceCount++;
else
fDeclarationCount++;
}
}
fResolutionTime += System.currentTimeMillis()-start;
} }
} finally {
index.releaseWriteLock(getReadlockCount()); boolean isFirstRequest= true;
boolean isFirstAddition= true;
IWritableIndex index= getIndex();
index.acquireWriteLock(getReadlockCount());
long start= System.currentTimeMillis();
try {
for (int i=0; i<orderedPaths.length; i++) {
if (pm.isCanceled())
return;
String path = orderedPaths[i];
if (path != null) {
if (fTrace) {
System.out.println("Indexer: adding " + path); //$NON-NLS-1$
}
IIndexFile file= addToIndex(index, path, symbolMap);
if (postAddToIndex(path, file)) {
if (isFirstRequest)
isFirstRequest= false;
else
fTotalSourcesEstimate--;
}
if (isFirstAddition)
isFirstAddition= false;
else
fCompletedHeaders++;
}
}
} finally {
index.releaseWriteLock(getReadlockCount());
}
fAddToIndexTime+= System.currentTimeMillis()-start;
}
finally {
fCompletedSources++;
} }
fAddToIndexTime+= System.currentTimeMillis()-start;
fCompletedSources++;
} }
private String[] extractSymbols(IASTTranslationUnit ast, final Map symbolMap) throws CoreException { private String[] extractSymbols(IASTTranslationUnit ast, final Map symbolMap) throws CoreException {
@ -514,7 +517,7 @@ public abstract class PDOMIndexerTask implements IPDOMIndexerTask {
System.out.println(name + " Timings: " //$NON-NLS-1$ System.out.println(name + " Timings: " //$NON-NLS-1$
+ (System.currentTimeMillis() - start) + " total, " //$NON-NLS-1$ + (System.currentTimeMillis() - start) + " total, " //$NON-NLS-1$
+ fParsingTime + " parser, " //$NON-NLS-1$ + (fParsingTime-fResolutionTime-fAddToIndexTime) + " parser, " //$NON-NLS-1$
+ fResolutionTime + " resolution, " //$NON-NLS-1$ + fResolutionTime + " resolution, " //$NON-NLS-1$
+ fAddToIndexTime + " index update."); //$NON-NLS-1$ + fAddToIndexTime + " index update."); //$NON-NLS-1$
System.out.println(name + " Result: " //$NON-NLS-1$ System.out.println(name + " Result: " //$NON-NLS-1$