mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Bug 300962: Postpone indexer setup until refresh is done.

Browse source
This commit is contained in:
Markus Schorn 2010-01-27 14:42:24 +00:00
parent a799c0c964
commit f85ec54f1c
2 changed files with 108 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,9 +188,11 @@ public class PDOMManager implements IWritableIndexManager, IListener {
private ArrayList<IndexerSetupParticipant> fSetupParticipants= new ArrayList<IndexerSetupParticipant>(); private ArrayList<IndexerSetupParticipant> fSetupParticipants= new ArrayList<IndexerSetupParticipant>();
private HashSet<ICProject> fPostponedProjects= new HashSet<ICProject>(); private HashSet<ICProject> fPostponedProjects= new HashSet<ICProject>();
private int fLastNotifiedState= IndexerStateEvent.STATE_IDLE; private int fLastNotifiedState= IndexerStateEvent.STATE_IDLE;
private boolean fInShutDown;
public PDOMManager() { public PDOMManager() {
PDOM.sDEBUG_LOCKS= "true".equals(Platform.getDebugOption(CCorePlugin.PLUGIN_ID + "/debug/index/locks")); //$NON-NLS-1$//$NON-NLS-2$ PDOM.sDEBUG_LOCKS= "true".equals(Platform.getDebugOption(CCorePlugin.PLUGIN_ID + "/debug/index/locks")); //$NON-NLS-1$//$NON-NLS-2$
addIndexerSetupParticipant(new WaitForRefreshJobs());
fProjectDescriptionListener= new CProjectDescriptionListener(this); fProjectDescriptionListener= new CProjectDescriptionListener(this);
fJobChangeListener= new JobChangeListener(this); fJobChangeListener= new JobChangeListener(this);
fPreferenceChangeListener= new IPreferenceChangeListener() { fPreferenceChangeListener= new IPreferenceChangeListener() {
@ -247,6 +249,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
} }
public void shutdown() { public void shutdown() {
fInShutDown= true;
new InstanceScope().getNode(CCorePlugin.PLUGIN_ID).removePreferenceChangeListener(fPreferenceChangeListener); new InstanceScope().getNode(CCorePlugin.PLUGIN_ID).removePreferenceChangeListener(fPreferenceChangeListener);
CCorePlugin.getDefault().getProjectDescriptionManager().removeCProjectDescriptionListener(fProjectDescriptionListener); CCorePlugin.getDefault().getProjectDescriptionManager().removeCProjectDescriptionListener(fProjectDescriptionListener);
final CoreModel model = CoreModel.getDefault(); final CoreModel model = CoreModel.getDefault();
@ -1400,6 +1403,8 @@ public class PDOMManager implements IWritableIndexManager, IListener {
* @param project * @param project
*/ */
public void notifyIndexerSetup(IndexerSetupParticipant participant, ICProject project) { public void notifyIndexerSetup(IndexerSetupParticipant participant, ICProject project) {
if (fInShutDown)
return;
synchronized(fSetupParticipants) { synchronized(fSetupParticipants) {
if (fPostponedProjects.contains(project)) { if (fPostponedProjects.contains(project)) {
addProject(project); addProject(project);

103
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WaitForRefreshJobs.java Normal file
View file

@ -0,0 +1,103 @@
/*******************************************************************************
* Copyright (c) 2010 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Markus Schorn - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.internal.core.pdom;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.cdt.core.index.IndexerSetupParticipant;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
/**
* Postpones indexer setup until there are no running refresh jobs.
*/
public class WaitForRefreshJobs extends IndexerSetupParticipant {
private Set<ICProject> fProjects= new HashSet<ICProject>();
private Set<Job> fRefreshJobs= Collections.synchronizedSet(new HashSet<Job>());
private IJobChangeListener fJobListener= new IJobChangeListener() {
public void sleeping(IJobChangeEvent event) {}
public void scheduled(IJobChangeEvent event) {}
public void running(IJobChangeEvent event) {}
public void done(IJobChangeEvent event) {
onJobDone(event.getJob());
}
public void awake(IJobChangeEvent event) {}
public void aboutToRun(IJobChangeEvent event) {}
};
@Override
public boolean postponeIndexerSetup(ICProject project) {
// Protect set of projects
synchronized(this) {
if (isRefreshing()) {
fProjects.add(project);
return true;
}
}
return false;
}
protected void onJobDone(Job job) {
fRefreshJobs.remove(job);
if (fRefreshJobs.isEmpty()) {
checkNotifyIndexer();
}
}
private void checkNotifyIndexer() {
Set<ICProject> projects;
// Protect set of projects
synchronized(this) {
if (isRefreshing())
return;
projects= fProjects;
fProjects= new HashSet<ICProject>();
}
for (ICProject project : projects) {
notifyIndexerSetup(project);
}
}
private boolean isRefreshing() {
updateRefreshJobs(ResourcesPlugin.FAMILY_AUTO_REFRESH);
if (fRefreshJobs.size() != 0) {
return true;
}
updateRefreshJobs(ResourcesPlugin.FAMILY_MANUAL_REFRESH);
if (fRefreshJobs.size() != 0) {
return true;
}
return false;
}
private void updateRefreshJobs(Object jobFamily) {
IJobManager jobManager = Job.getJobManager();
Job[] refreshJobs = jobManager.find(jobFamily);
if (refreshJobs != null) {
for (Job j : refreshJobs) {
if (fRefreshJobs.add(j)) {
j.addJobChangeListener(fJobListener);
}
}
}
}
}