From 911c189dfbaa6733f0ee21e01ad6fe49160ba38f Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Fri, 30 Mar 2007 12:41:31 +0000
Subject: [PATCH] Fix related to 180164, chunk-cache size was fixed to 5mb

---
 .../eclipse/cdt/internal/core/pdom/db/ChunkCache.java  |  9 +++++++++
 .../internal/core/pdom/indexer/PDOMIndexerTask.java    | 10 +++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java
index 41e3e469d24..36be4aa0f29 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java
@@ -100,6 +100,13 @@ public final class ChunkCache {
 		}	
 	}
 
+	/**                                                                           
+	 * Returns the maximum size of the chunk cache in bytes.
+	 */                                                                           
+	public synchronized long getMaxSize() {
+		return (long) fPageTable.length * Database.CHUNK_SIZE;
+	}
+
 	/**                                                                           
 	 * Clears the page table and changes it to hold chunks with
 	 * maximum total memory of <code>maxSize</code>.       
@@ -113,6 +120,7 @@ public final class ChunkCache {
 			System.arraycopy(fPageTable, 0, newTable, 0, oldLength);
 			fTableIsFull= false;
 			fPointer= oldLength;
+			fPageTable= newTable;
 		}
 		else {
 			for (int i=newLength; i<oldLength; i++) {
@@ -124,6 +132,7 @@ public final class ChunkCache {
 			System.arraycopy(fPageTable, 0, newTable, 0, newLength);
 			fTableIsFull= true;
 			fPointer= 0;
+			fPageTable= newTable;
 		}       
 	}                                                                             
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java
index 311af18a685..d42912a30bd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMIndexerTask.java
@@ -36,6 +36,7 @@ import org.eclipse.cdt.internal.core.index.IIndexFragmentFile;
 import org.eclipse.cdt.internal.core.index.IWritableIndex;
 import org.eclipse.cdt.internal.core.pdom.IndexerProgress;
 import org.eclipse.cdt.internal.core.pdom.PDOMWriter;
+import org.eclipse.cdt.internal.core.pdom.db.ChunkCache;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -307,9 +308,12 @@ public abstract class PDOMIndexerTask extends PDOMWriter implements IPDOMIndexer
 				long hits= index.getCacheHits();
 				long tries= misses+hits;
 				double missPct= tries==0 ? 0.0 : (double) misses / (double) tries;
-				System.out.println(name + " Cache: " //$NON-NLS-1$
-					+ hits + " hits, "  //$NON-NLS-1$
-					+ misses + "(" + nf.format(missPct)+ ") misses."); //$NON-NLS-1$ //$NON-NLS-2$
+				nf.setMinimumFractionDigits(4);
+				nf.setMaximumFractionDigits(4);
+				System.out.println(name + " Cache[" //$NON-NLS-1$
+					+ ChunkCache.getSharedInstance().getMaxSize() / 1024 / 1024 + "mb]: " + //$NON-NLS-1$
+					+ hits + " hits, "   //$NON-NLS-1$
+					+ misses + "(" + nf.format(missPct)+ ") misses.");   //$NON-NLS-1$//$NON-NLS-2$
 			}
 		}
 	}