[Mulgara-svn] r915 - projects/xa2/object-pool/src/trie

[andrae at mulgara.org]

Author: andrae
Date: 2008-05-12 01:19:41 -0700 (Mon, 12 May 2008)
New Revision: 915

Modified:
   projects/xa2/object-pool/src/trie/MemoryTrieTest.java
Log:
Fixed up some of the profiling code.



Modified: projects/xa2/object-pool/src/trie/MemoryTrieTest.java
===================================================================
--- projects/xa2/object-pool/src/trie/MemoryTrieTest.java	2008-05-12 06:45:18 UTC (rev 914)
+++ projects/xa2/object-pool/src/trie/MemoryTrieTest.java	2008-05-12 08:19:41 UTC (rev 915)
@@ -301,7 +301,7 @@
     long _avlSS = 0;
     int nSS = 0;
 
-    for (int i = 0; i < 100; i++) {
+    for (int i = 0; i < 200; i++) {
       if (buffer.remaining() < 2*1024*1024 && chan.read(buffer.compact()) == -1) {
         break;
       }
@@ -343,7 +343,7 @@
           }
         }
 
-        for (int k = 0; k < 10; k++) {
+        for (int k = 0; k < 20; k++) {
           key = new byte[((int)buffer.get()) & 0x000000FF];
           buffer.get(key);
           keyBytes = new Bytes(key);
@@ -361,7 +361,7 @@
             }
           }
 
-          for (int ii = 0; ii < 1000; ii++) {
+          for (int ii = 0; ii < 50; ii++) {
             key = new byte[((int)buffer.get()) & 0x0000001F];
             buffer.get(key);
             keyBytes = new Bytes(key);
@@ -370,7 +370,7 @@
               namesMap.put(keyBytes, n);
               long _sss = System.currentTimeMillis();
               namesTrie.insert(DataEntry.getEntry(key, n));
-              _aggregateS += System.currentTimeMillis() - _sss;
+              _aggregateSS += System.currentTimeMillis() - _sss;
               _avlSS += key.length;
               nSS++;
 
@@ -389,9 +389,9 @@
     System.out.printf("  %d long entries ave: %d in: %dms; ave %dus per entry, %dns per byte\n",
         nL, (_avlL / nL), _aggregateL, (_aggregateL * 1000 / nL), (_aggregateL * 1000000 / _avlL));
     System.out.printf("  %d short entries ave: %d in: %dms; ave %dus per entry, %dns per byte\n",
+        nS, (_avlS / nS), _aggregateS, (_aggregateS * 1000 / nS), (_aggregateS * 1000000 / _avlS));
+    System.out.printf("  %d very short entries ave: %d in: %dms; ave %dus per entry, %dns per byte\n",
         nSS, (_avlSS / nSS), _aggregateSS, (_aggregateSS * 1000 / nSS), (_aggregateSS * 1000000 / _avlSS));
-    System.out.printf("  %d very short entries ave: %d in: %dms; ave %dus per entry, %dns per byte\n",
-        nS, (_avlS / nS), _aggregateS, (_aggregateS * 1000 / nS), (_aggregateS * 1000000 / _avlS));
     chan.close();
 
     long _startLookup = System.currentTimeMillis();