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

2004-08-18 Chris Wiebe

Browse source 
fix for bug #71353
	* browser/org/eclipse/cdt/internal/core/browser/cache/TypeCache.java
	* browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java
This commit is contained in:
Chris Wiebe 2004-08-18 23:46:04 +00:00
parent d9bdbc066c
commit f110584379
3 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/ChangeLog
View file

@ -1,3 +1,9 @@
2004-08-18 Chris Wiebe
fix for bug #71353
* browser/org/eclipse/cdt/internal/core/browser/cache/TypeCache.java
* browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java
2004-08-15 Chris Wiebe
make isOnSourceEntry(IPath) public method

3
core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCache.java vendored
View file

@ -89,7 +89,8 @@ public class TypeCache implements ITypeCache {
TypeCacherJob deltaJob = (TypeCacherJob)job;
IStatus status = event.getResult();
if (status != null) {
boolean jobFinished = status.equals(Status.OK_STATUS);
boolean jobFinished = (status.equals(Status.OK_STATUS)
&& !deltaJob.isIndexerBusy());
// remove the completed deltas
synchronized(fDeltas) {
for (Iterator i = fDeltas.iterator(); i.hasNext(); ) {

53
core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeCacherJob.java vendored
View file

@ -15,11 +15,14 @@ import org.eclipse.cdt.core.browser.TypeSearchScope;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICElementDelta;
import org.eclipse.cdt.core.search.ICSearchConstants;
import org.eclipse.cdt.internal.core.index.IIndex;
import org.eclipse.cdt.internal.core.model.CModelManager;
import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
@ -36,12 +39,14 @@ public class TypeCacherJob extends BasicJob {
private ITypeCache fTypeCache;
private TypeCacheDelta[] fDeltas;
private boolean fEnableIndexing;
private boolean fIndexerIsBusy;
public TypeCacherJob(ITypeCache typeCache, TypeCacheDelta[] deltas, boolean enableIndexing) {
super(TypeCacheMessages.getString("TypeCacherJob.defaultJobName"), FAMILY); //$NON-NLS-1$
fTypeCache = typeCache;
fDeltas = deltas;
fEnableIndexing = enableIndexing;
fIndexerIsBusy = false;
fIndexManager = CModelManager.getDefault().getIndexManager();
setPriority(BUILD);
setSystem(true);
@ -57,6 +62,10 @@ public class TypeCacherJob extends BasicJob {
return fDeltas;
}
public boolean isIndexerBusy() {
return fIndexerIsBusy;
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.Job#run(IProgressMonitor)
*/
@ -118,12 +127,7 @@ public class TypeCacherJob extends BasicJob {
fTypeCache.flush(scope);
if (!scope.encloses(project)) {
if (project.exists() && project.isOpen()) {
success = false;
if (fEnableIndexing) {
success = fIndexManager.performConcurrentJob(
new IndexerDependenciesJob(fIndexManager, fTypeCache, scope),
ICSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, monitor, null);
}
success = doIndexerJob(new IndexerDependenciesJob(fIndexManager, fTypeCache, scope), monitor);
}
}
@ -140,12 +144,7 @@ public class TypeCacherJob extends BasicJob {
monitor.beginTask("", 100); //$NON-NLS-1$
if (project.exists() && project.isOpen()) {
success = false;
if (fEnableIndexing) {
success = fIndexManager.performConcurrentJob(
new IndexerTypesJob(fIndexManager, fTypeCache, scope),
ICSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, monitor, null);
}
success = doIndexerJob(new IndexerTypesJob(fIndexManager, fTypeCache, scope), monitor);
}
if (!success || monitor.isCanceled()) {
@ -155,6 +154,26 @@ public class TypeCacherJob extends BasicJob {
monitor.done();
}
private boolean doIndexerJob(IndexerJob job, IProgressMonitor monitor) {
if (!fEnableIndexing) {
return false;
}
// check if indexer is busy
fIndexerIsBusy = false;
try {
fIndexManager.performConcurrentJob(new DummyIndexerJob(fIndexManager, fTypeCache.getProject()),
ICSearchConstants.CANCEL_IF_NOT_READY_TO_SEARCH, new NullProgressMonitor(), null);
} catch (OperationCanceledException e) {
fIndexerIsBusy = true;
}
// do an immediate (but possibly incomplete) search
// if fIndexerIsBusy the cache will stay dirty and we'll hit the indexer again next time
return fIndexManager.performConcurrentJob(job,
ICSearchConstants.FORCE_IMMEDIATE_SEARCH, monitor, null);
}
private static final int PATH_ENTRY_FLAGS = ICElementDelta.F_ADDED_PATHENTRY_SOURCE
| ICElementDelta.F_REMOVED_PATHENTRY_SOURCE
| ICElementDelta.F_CHANGED_PATHENTRY_INCLUDE
@ -221,5 +240,15 @@ public class TypeCacherJob extends BasicJob {
}
}
}
private static final class DummyIndexerJob extends IndexerJob {
public DummyIndexerJob(IndexManager indexManager, IProject project) {
super(indexManager, project);
}
protected boolean processIndex(IIndex index, IProject project, IProgressMonitor progressMonitor) throws InterruptedException {
return false;
}
};
}