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

Fixes a dead-lock in the indexer job.

Browse source
This commit is contained in:
Markus Schorn 2006-09-27 13:38:40 +00:00
parent 120526e448
commit 81828c8799
1 changed files with 4 additions and 1 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/PDOMIndexerJob.java
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - initial API and implementation * QNX Software Systems - initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.pdom; package org.eclipse.cdt.internal.core.pdom;
@ -59,6 +60,8 @@ public class PDOMIndexerJob extends Job {
} }
currentTask.run(monitor); currentTask.run(monitor);
synchronized (taskMutex) { synchronized (taskMutex) {
// mschorn: currentTask must be set to null, otherwise cancelJobs() waits forever.
currentTask= null;
if (isCancelling) { if (isCancelling) {
// TODO chance for confusion here is user cancels // TODO chance for confusion here is user cancels
// while project is getting deletes. // while project is getting deletes.
@ -78,7 +81,7 @@ public class PDOMIndexerJob extends Job {
String showTimings = Platform.getDebugOption(CCorePlugin.PLUGIN_ID String showTimings = Platform.getDebugOption(CCorePlugin.PLUGIN_ID
+ "/debug/pdomtimings"); //$NON-NLS-1$ + "/debug/pdomtimings"); //$NON-NLS-1$
if (showTimings != null && showTimings.equalsIgnoreCase("true")) //$NON-NLS-1$ if (showTimings != null && showTimings.equalsIgnoreCase("true")) //$NON-NLS-1$
System.out.println("PDOM Indexer Job Time: " + (System.currentTimeMillis() - start)); System.out.println("PDOM Indexer Job Time: " + (System.currentTimeMillis() - start)); //$NON-NLS-1$
return Status.OK_STATUS; return Status.OK_STATUS;
} }