# HG changeset patch
# User Dan Creswell <dan.creswell@gmail.com>
# Date 1276335690 -3600
# Node ID 5a2eeff2a04312b24d18d0ebf7010df1dbee0610
# Parent  e11623cfc4574f63be263f4894d57a52257bf788
Update configuration to cover optimistic batcher

diff -r e11623cfc457 -r 5a2eeff2a043 config/blitz.config
--- a/config/blitz.config	Sat Jun 12 10:12:32 2010 +0100
+++ b/config/blitz.config	Sat Jun 12 10:41:30 2010 +0100
@@ -126,9 +126,11 @@
     // Maximum number of entry instances to cache for a particular Entry type
     //
     entryReposCacheSize = 4096;
-    // entryReposCacheSize = 100;
+    // entryReposCacheSize = 128;
     // entryReposCacheSize = 512;
 
+    cacheEntriesPerPartition = 32;
+
     // Enable generic readahead for all types by setting this to non-zero.
     // Actual value determines how many Entry's will be loaded from disk
     // when readahead is activated.  Note this value should be smaller than
@@ -193,30 +195,28 @@
     // and dispatching blocked takes or reads
     //
     maxTaskThreads = 8;
-	maxEventProcessors = 4;
+    maxEventProcessors = 4;
 
     storageModel = new Transient();
 
-    // storageModel = new TimeBarrierPersistent(true, true, 10000, 524288, 10000);
+    // storageModel = new TimeBarrierPersistent(true, true, 10000, 524288, 5000);
 
     // Persistent storage settings
     // Note:  The third parameter (batching time) can radically affect 
     // throughput in concurrent conditions.  You're advised to try various
     // settings for your desired load as variations in OS and hard-disk
     // performance determine what is appropriate for each machine.
+	//
+	// Note: the fourth parameter has changed behaviour. Most users likely have this set to true
+	// which will select the concurrent (production-tested) batcher and represents the stable option.
+	// Setting this parameter to false no longer selects the old (low performance) serial batcher, 
+	// rather it enables an optimistic batcher that gives even higher performance than the concurrent
+	// batcher.
     //
-    // A safe setting to start with is 10ms but you might also wish to try 0ms
-    // Use this setting for local/embedded usage
-    //
+    // storageModel = new Persistent(true, true, 0, 500000, true, 10000, 32768);
+    // storageModel = new Persistent(true, true, 1, true, 10000, 32768);
 
-    // For raw, single-threaded benchmarks, use 0 log buffering time
-    // storageModel = new Persistent(true, true, 0, true, 10000, 32768);
-    // notifytest storageModel = new Persistent(true, true, 0, true, 10, 32768);
-
-    // For concurrent benchmark or application use non-zero log buffering time
-    // storageModel = new Persistent(true, true, 10, true, 10000, 32768);
-
-	statsDump = 60000;
+    statsDump = 60000;
 	
     // Enable standard destroy semantics - by default, Blitz does NOT
     // delete state at destroy.  Enable that feature here and invoke