Fix for 154060, dead lock in Deadlock in PDOMIndexerJob.cancelJobs()

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java

@@ -11,9 +11,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.pdom;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.dom.IPDOMIndexer;
 import org.eclipse.cdt.core.dom.IPDOMIndexerTask;
@@ -29,18 +26,17 @@ import org.eclipse.core.runtime.jobs.Job;
  */
 public class PDOMIndexerJob extends Job {
 
-	private final PDOMManager manager;
+	private final PDOMManager pdomManager;
 	
-	private LinkedList queue = new LinkedList();
 	private IPDOMIndexerTask currentTask;
-	private boolean isCancelling = false;
+	private boolean cancelledByManager= false;
 	private Object taskMutex = new Object();
 	
 	private IProgressMonitor monitor;
 
 	public PDOMIndexerJob(PDOMManager manager) {
 		super(CCorePlugin.getResourceString("pdom.indexer.name")); //$NON-NLS-1$
-		this.manager = manager;
+		this.pdomManager = manager;
 		setPriority(Job.LONG);
 	}
 
@@ -52,30 +48,30 @@ public class PDOMIndexerJob extends Job {
 		String taskName = CCorePlugin.getResourceString("pdom.indexer.task"); //$NON-NLS-1$
 		monitor.beginTask(taskName, IProgressMonitor.UNKNOWN);
 		
-		fillQueue();
+		while (!pdomManager.finishIndexerJob()) {
-		while (true) {
+			IPDOMIndexerTask nextTask= pdomManager.getNextTask();
-			while (!queue.isEmpty()) {
+			synchronized (taskMutex) {
-				synchronized (taskMutex) {
+				if (!cancelledByManager) {	
-					currentTask = (IPDOMIndexerTask)queue.removeFirst();
+					currentTask= nextTask;	// write to currentTask needs protection
 				}
+			}
+			if (currentTask != null) {		// read on currentTask is ok (no write in other thread)
 				currentTask.run(monitor);
 				synchronized (taskMutex) {
-					// mschorn: currentTask must be set to null, otherwise cancelJobs() waits forever.
+					currentTask= null;		// write to currentTask needs protection
-					currentTask= null;
+					if (cancelledByManager) {	
-					if (isCancelling) {
 						// TODO chance for confusion here is user cancels
 						// while project is getting deletes.
 						monitor.setCanceled(false);
-						isCancelling = false;
+						cancelledByManager = false;
 						taskMutex.notify();
-					} else if (monitor.isCanceled())
+					} 
-						return Status.CANCEL_STATUS;
 				}
 			}
-			if (manager.finishIndexerJob())
+			if (monitor.isCanceled()) {
-				break;
+				pdomManager.cancelledByUser();
-			else
+				return Status.CANCEL_STATUS;
-				fillQueue();
+			}
 		}
 		
 		String showTimings = Platform.getDebugOption(CCorePlugin.PLUGIN_ID
@@ -86,26 +82,11 @@ public class PDOMIndexerJob extends Job {
 		return Status.OK_STATUS;
 	}
 		
-	private void fillQueue() {
-		synchronized (taskMutex) {
-			IPDOMIndexerTask task = manager.getNextTask();
-			while (task != null) {
-				queue.addLast(task);
-				task = manager.getNextTask();
-			}
-		}
-	}
-	
 	public void cancelJobs(IPDOMIndexer indexer) {
 		synchronized (taskMutex) {
-			for (Iterator i = queue.iterator(); i.hasNext();) {
-				IPDOMIndexerTask task = (IPDOMIndexerTask)i.next();
-				if (task.getIndexer().equals(indexer))
-					i.remove();
-			}
 			if (currentTask != null && currentTask.getIndexer().equals(indexer)) {
 				monitor.setCanceled(true);
-				isCancelling = true;
+				cancelledByManager = true;
 				try {
 					taskMutex.wait();
 				} catch (InterruptedException e) {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java

@@ -66,8 +66,8 @@ public class PDOMManager implements IPDOMManager, IElementChangedListener {
 		if (pdom == null) {
 			String dbName = rproject.getPersistentProperty(dbNameProperty);
 			if (dbName == null) {
-				dbName = project.getElementName() + "."
+				dbName = project.getElementName() + "." //$NON-NLS-1$
-					+ System.currentTimeMillis() + ".pdom";
+					+ System.currentTimeMillis() + ".pdom"; //$NON-NLS-1$
 				rproject.setPersistentProperty(dbNameProperty, dbName);
 			}
 			IPath dbPath = CCorePlugin.getDefault().getStateLocation().append(dbName);
@@ -292,6 +292,12 @@ public class PDOMManager implements IPDOMManager, IElementChangedListener {
 		}
     }
     
+    void cancelledByUser() {
+    	synchronized (indexerJobMutex) {
+    		indexerJobQueue.clear();
+		}
+    }
+    
     boolean finishIndexerJob() {
     	synchronized (indexerJobMutex) {
 			if (indexerJobQueue.isEmpty()) {