enhanced synchronisation in plasmaWordIndex

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

source/de/anomic/plasma/plasmaWordIndex.java

@@ -175,14 +175,12 @@ public final class plasmaWordIndex extends indexAbstractRI implements indexRI {
 
     public void flushControl() {
         // check for forced flush
-        synchronized (ramCache) {
+        synchronized (this) { ramCache.shiftK2W(); }
-            ramCache.shiftK2W();
         flushCache(ramCache.maxURLinWCache() - ramCache.wCacheReferenceLimit);
         if (ramCache.wSize() > ramCache.getMaxWordCount()) {
             flushCache(ramCache.wSize() + 500 - ramCache.getMaxWordCount());
         }
     }
-    }
 
     public indexContainer addEntry(String wordHash, indexEntry entry, long updateTime, boolean dhtCase) {
         indexContainer c;
@@ -201,7 +199,7 @@ public final class plasmaWordIndex extends indexAbstractRI implements indexRI {
     }
 
     public void flushCacheSome() {
-        synchronized (ramCache) { ramCache.shiftK2W(); }
+        synchronized (this) { ramCache.shiftK2W(); }
         int flushCount = ramCache.wSize() / 420;
         if (flushCount > 100) flushCount = 100;
         if (flushCount < 10) flushCount = Math.min(10, ramCache.wSize());
@@ -210,13 +208,13 @@ public final class plasmaWordIndex extends indexAbstractRI implements indexRI {
     
     public void flushCache(int count) {
         if (count <= 0) return;
-        synchronized (ramCache) {
         busyCacheFlush = true;
         String wordHash;
         System.out.println("DEBUG-Started flush of " + count + " entries from RAM to DB");
         long start = System.currentTimeMillis();
         for (int i = 0; i < count; i++) { // possible position of outOfMemoryError ?
             if (ramCache.wSize() == 0) break;
+            synchronized (this) {
                 wordHash = ramCache.bestFlushWordHash();
                 
                 // flush the wordHash
@@ -236,12 +234,12 @@ public final class plasmaWordIndex extends indexAbstractRI implements indexRI {
                 }
                 
                 // pause to next loop to give other processes a chance to use IO
-                try {Thread.sleep(8);} catch (InterruptedException e) {}
+                try {this.wait(8);} catch (InterruptedException e) {}
+            }
         }
         System.out.println("DEBUG-Finished flush of " + count + " entries from RAM to DB in " + (System.currentTimeMillis() - start) + " milliseconds");
         busyCacheFlush = false;
     }
-    }
     
     private static final int hour = 3600000;
     private static final int day  = 86400000;
@@ -412,7 +410,7 @@ public final class plasmaWordIndex extends indexAbstractRI implements indexRI {
     }
 
     public void close(int waitingBoundSeconds) {
-        synchronized (ramCache) {
+        synchronized (this) {
             ramCache.close(waitingBoundSeconds);
             if (useCollectionIndex) collections.close(-1);
             assortmentCluster.close(-1);