mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 13:25:45 +02:00
Code Issues Wiki Activity

Fix for 179644, scheduling rule for initializing indexer.

Browse source
This commit is contained in:
Markus Schorn 2007-03-28 08:46:10 +00:00
parent e5ff47ccf2
commit 88ea27d319
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,6 +80,7 @@ import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.MultiRule;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
@ -92,6 +93,8 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChange
*/ */
public class PDOMManager implements IWritableIndexManager, IListener { public class PDOMManager implements IWritableIndexManager, IListener {
private static final String SETTINGS_FOLDER_NAME = ".settings"; //$NON-NLS-1$
private static final class PerInstanceSchedulingRule implements ISchedulingRule { private static final class PerInstanceSchedulingRule implements ISchedulingRule {
public boolean contains(ISchedulingRule rule) { public boolean contains(ISchedulingRule rule) {
return rule == this; return rule == this;
@ -534,7 +537,7 @@ public class PDOMManager implements IWritableIndexManager, IListener {
private void syncronizeProjectSettings(IProject project, IProgressMonitor monitor) { private void syncronizeProjectSettings(IProject project, IProgressMonitor monitor) {
try { try {
IFolder settings= project.getFolder(".settings"); //$NON-NLS-1$ IFolder settings= project.getFolder(SETTINGS_FOLDER_NAME);
settings.refreshLocal(IResource.DEPTH_INFINITE, monitor); settings.refreshLocal(IResource.DEPTH_INFINITE, monitor);
} catch (CoreException e) { } catch (CoreException e) {
CCorePlugin.log(e); CCorePlugin.log(e);
@ -546,7 +549,17 @@ public class PDOMManager implements IWritableIndexManager, IListener {
return family == PDOMManager.this; return family == PDOMManager.this;
} }
}; };
addProject.setRule(project); // in case a team provider does not implement a rule-factory, the
// platform makes a pessimistic choice and locks the workspace. We
// have to check for that.
ISchedulingRule rule= project.getWorkspace().getRuleFactory().refreshRule(project.getFolder(SETTINGS_FOLDER_NAME));
if (project.contains(rule)) {
rule= project;
}
else if (!rule.contains(project)) {
rule= new MultiRule(new ISchedulingRule[] {rule, project});
}
addProject.setRule(rule);
addProject.setSystem(true); addProject.setSystem(true);
addProject.schedule(); addProject.schedule();
} }
@ -597,7 +610,10 @@ public class PDOMManager implements IWritableIndexManager, IListener {
WritablePDOM pdom= null; WritablePDOM pdom= null;
synchronized (fProjectToPDOM) { synchronized (fProjectToPDOM) {
IProject rproject= project.getProject(); IProject rproject= project.getProject();
pdom = (WritablePDOM) fProjectToPDOM.remove(rproject); pdom = (WritablePDOM) fProjectToPDOM.remove(rproject);
if (pdom != null) {
fFileToProject.remove(pdom.getDB().getLocation());
}
} }
if (pdom != null) { if (pdom != null) {