Put a mutex around lru cache operations in the PDOM database. Made open declarations less dumb by getting it to do a full parse again.

2 files changed, 43 insertions, 41 deletions

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java
index b90395c433e..d4a43752459 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java
@@ -292,6 +292,7 @@ public class Database {
 	}
 	
 	// Chunk management
+	static private Object lruMutex = new Object();
 	static private Chunk lruFirst;
 	static private Chunk lruLast;
 	static private int lruSize;
@@ -316,65 +317,67 @@ public class Database {
 	}
 	
 	static private final void lruPutFirst(Chunk chunk, boolean isNew) throws CoreException {
-		// If this chunk is already first, we're good
-		if (chunk == lruFirst)
-			return;
-		
-		if (!isNew) {
-			// Remove from current position in cache
-			if (chunk.lruPrev != null) {
-				chunk.lruPrev.lruNext = chunk.lruNext;
-			}
-			if (chunk.lruNext != null) {
-				chunk.lruNext.lruPrev = chunk.lruPrev;
-			} else {
-				// No next => New last
-				lruLast = chunk.lruPrev;
+		synchronized (lruMutex) {
+			// If this chunk is already first, we're good
+			if (chunk == lruFirst)
+				return;
+			
+			if (!isNew) {
+				// Remove from current position in cache
+				if (chunk.lruPrev != null) {
+					chunk.lruPrev.lruNext = chunk.lruNext;
+				}
+				if (chunk.lruNext != null) {
+					chunk.lruNext.lruPrev = chunk.lruPrev;
+				} else {
+					// No next => New last
+					lruLast = chunk.lruPrev;
+				}
 			}
-		}
-
-		// Insert at front of cache
-		chunk.lruNext = lruFirst;
-		chunk.lruPrev = null;
-		if (lruFirst != null)
-			lruFirst.lruPrev = chunk;
-		lruFirst = chunk;
-		if (lruLast == null)
-			lruLast = chunk;
-
-		if (isNew) {
-			// New chunk, see if we need to release one
-			if (lruSize == lruMax) {
-				Chunk last = lruLast;
-				lruLast = last.lruPrev;
-				lruLast.lruNext = null;
-				last.free();
-			} else {
-				++lruSize;
+	
+			// Insert at front of cache
+			chunk.lruNext = lruFirst;
+			chunk.lruPrev = null;
+			if (lruFirst != null)
+				lruFirst.lruPrev = chunk;
+			lruFirst = chunk;
+			if (lruLast == null)
+				lruLast = chunk;
+	
+			if (isNew) {
+				// New chunk, see if we need to release one
+				if (lruSize == lruMax) {
+					Chunk last = lruLast;
+					lruLast = last.lruPrev;
+					lruLast.lruNext = null;
+					last.free();
+				} else {
+					++lruSize;
+				}
 			}
 		}
 	}
 	
-	private Object mutex = new Object();
+	private Object lockMutex = new Object();
 	private Thread lockOwner;
 	private int lockCount;
 	
 	public void acquireLock() throws InterruptedException {
-		synchronized (mutex) {
+		synchronized (lockMutex) {
 			if (lockOwner != Thread.currentThread())
 				while (lockCount > 0)
-					mutex.wait();
+					lockMutex.wait();
 			++lockCount;
 			lockOwner = Thread.currentThread();
 		}
 	}
 	
 	public void releaseLock() {
-		synchronized (mutex) {
+		synchronized (lockMutex) {
 			--lockCount;
 			if (lockCount == 0) {
 				lockOwner = null;
-				mutex.notify();
+				lockMutex.notify();
 			}
 		}
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java
index 1205568e754..b0806599396 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java
@@ -66,8 +66,7 @@ public class OpenDeclarationsAction extends SelectionParseAction {
 				IPDOM pdom = CCorePlugin.getPDOMManager().getPDOM(workingCopy.getCProject());
 				pdom.acquireReadLock();
 				try {
-					IASTTranslationUnit ast = workingCopy.getLanguage().getASTTranslationUnit(workingCopy,
-							ILanguage.AST_SKIP_ALL_HEADERS | ILanguage.AST_USE_INDEX);
+					IASTTranslationUnit ast = workingCopy.getLanguage().getASTTranslationUnit(workingCopy, ILanguage.AST_USE_INDEX);
 					IASTName[] selectedNames = workingCopy.getLanguage().getSelectedNames(ast, selectionStart, selectionLength);
 
 					if (selectedNames.length > 0 && selectedNames[0] != null) { // got a name