- new development cycle

- removed temporary configuration with safe setting for indexer threads (=1) and replaced it with best value computed during performance tests (1/2 of number of processors)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5963 6c8d7289-2bf4-0310-a012-ef5d649a1542

build.properties

@@ -3,7 +3,7 @@ javacSource=1.5
 javacTarget=1.5
 
 # Release Configuration
-releaseVersion=0.80
+releaseVersion=0.81
 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz

defaults/yacy.init

@@ -688,7 +688,6 @@ crawler.MaxActiveThreads = 30
 
 # maximum size of indexing queue
 indexer.slots = 40
-indexer.threads = 1
 
 # maximum size of stacker queue
 stacker.slots = 2000

source/de/anomic/plasma/plasmaSwitchboard.java

@@ -593,11 +593,11 @@ public final class plasmaSwitchboard extends serverAbstractSwitch<IndexingStack.
         // init robinson cluster
         // before we do that, we wait some time until the seed list is loaded.
         //while (((System.currentTimeMillis() - startedSeedListAquisition) < 8000) && (this.webIndex.seedDB.sizeConnected() == 0)) try {Thread.sleep(1000);} catch (final InterruptedException e) {}
-        try {Thread.sleep(1000);} catch (final InterruptedException e) {}
+        //try {Thread.sleep(1000);} catch (final InterruptedException e) {}
         this.clusterhashes = this.webIndex.peers().clusterHashes(getConfig("cluster.peers.yacydomain", ""));
         
         // deploy blocking threads
-        int indexerThreads = (int) this.getConfigLong(plasmaSwitchboardConstants.INDEXER_THREADS, 1);
+        int indexerThreads = Math.max(1, serverProcessor.useCPU / 2);
         indexingStorageProcessor      = new serverProcessor<indexingQueueEntry>(
                 "storeDocumentIndex",
                 "This is the sequencing step of the indexing queue: no concurrency is wanted here, because the access of the indexer works better if it is not concurrent. Files are written as streams, councurrency would destroy IO performance. In this process the words are written to the RWI cache, which flushes if it is full.",

source/de/anomic/plasma/plasmaSwitchboardConstants.java

@@ -123,7 +123,6 @@ public final class plasmaSwitchboardConstants {
     public static final String INDEXER_METHOD_JOBCOUNT      = "queueSize";
     public static final String INDEXER_METHOD_FREEMEM       = "deQueueFreeMem";
     public static final String INDEXER_SLOTS                = "indexer.slots";
-    public static final String INDEXER_THREADS              = "indexer.threads";
     // 90_cleanup
     /**
      * <p><code>public static final String <strong>CLEANUP</strong> = "90_cleanup"</code></p>