[Bigdata-commit] SF.net SVN: bigdata:[3529] branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/ bigdata/rwstore/RWStore.java

[<mar...@us...>]

Revision: 3529
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3529&view=rev
Author:   martyncutcher
Date:     2010-09-10 17:12:33 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Refined RWStore allocation stats  display

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java	2010-09-10 16:02:26 UTC (rev 3528)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/rwstore/RWStore.java	2010-09-10 17:12:33 UTC (rev 3529)
@@ -194,9 +194,9 @@
 	 *       com.bigdata.rwstore.RWStore.allocSizes=1,2,3,5... 
 	 *       
 	 */
-	// static final int[] DEFAULT_ALLOC_SIZES = { 1, 2, 3, 5, 8, 12, 16, 32, 48, 64, 128, 192, 320, 512, 832, 1344, 2176, 3520 };
-	private static final int[] DEFAULT_ALLOC_SIZES = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181 };
-	// static final int[] ALLOC_SIZES = { 1, 2, 4, 8, 16, 32, 64, 128 };
+	private static final int[] DEFAULT_ALLOC_SIZES = { 1, 2, 3, 5, 8, 12, 16, 32, 48, 64, 128, 192, 320, 512, 832, 1344, 2176, 3520 };
+	// private static final int[] DEFAULT_ALLOC_SIZES = { 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181 };
+	// private static final int[] ALLOC_SIZES = { 1, 2, 4, 8, 16, 32, 64, 128 };
 
 	final int m_maxFixedAlloc;
 	final int m_minFixedAlloc;
@@ -2108,18 +2108,23 @@
 		str.append("RWStore Allocation Summary\n");
 		str.append("-------------------------\n");
 		long treserved = 0;
+		long treservedSlots = 0;
 		long tfilled = 0;
+		long tfilledSlots = 0;
 		for (int i = 0; i < stats.length; i++) {
-			str.append("Allocation: " + stats[i].m_blockSize);
 			long reserved = stats[i].m_reservedSlots * stats[i].m_blockSize;
 			treserved += reserved;
-			str.append(", reserved: " + reserved);
+			treservedSlots += stats[i].m_reservedSlots;
 			long filled = stats[i].m_filledSlots * stats[i].m_blockSize;
 			tfilled += filled;
-			str.append(", filled: " + filled);
+			tfilledSlots += stats[i].m_filledSlots;
+			
+			str.append("Allocation: " + stats[i].m_blockSize);
+			str.append(", slots: "  + stats[i].m_filledSlots + "/" + stats[i].m_reservedSlots);
+			str.append(", storage: "  + filled + "/" + reserved);
 			str.append("\n");
 		}
-		str.append("Total - file: " + convertAddr(m_fileSize) + ", reserved: " + treserved + ", filled: " + tfilled + "\n");
+		str.append("Total - file: " + convertAddr(m_fileSize) + ", slots: " + tfilledSlots + "/" + treservedSlots + ", storage: " + tfilled + "/"  + treserved + "\n");
 	}
 
 	public ArrayList getStorageBlockAddresses() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.