possible fix for deadlock in search execution

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

source/de/anomic/plasma/plasmaSearchEvent.java

@@ -35,6 +35,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
 
 import de.anomic.index.indexContainer;
 import de.anomic.index.indexRWIEntry;
@@ -65,7 +66,7 @@ public final class plasmaSearchEvent {
     
     public static int workerThreadCount = 10;
     public static String lastEventID = "";
-    private static HashMap<String, plasmaSearchEvent> lastEvents = new HashMap<String, plasmaSearchEvent>(); // a cache for objects from this class: re-use old search requests
+    private static ConcurrentHashMap<String, plasmaSearchEvent> lastEvents = new ConcurrentHashMap<String, plasmaSearchEvent>(); // a cache for objects from this class: re-use old search requests
     public static final long eventLifetime = 600000; // the time an event will stay in the cache, 10 Minutes
     private static final int max_results_preparation = 200;
     
@@ -449,54 +450,49 @@ public final class plasmaSearchEvent {
     }
 
     public static plasmaSearchEvent getEvent(String eventID) {
-        synchronized (lastEvents) {
+        return (plasmaSearchEvent) lastEvents.get(eventID);
-            return (plasmaSearchEvent) lastEvents.get(eventID);
-        }
     }
     
     public static plasmaSearchEvent getEvent(plasmaSearchQuery query,
-            plasmaSearchRankingProfile ranking,
+        plasmaSearchRankingProfile ranking,
-            plasmaWordIndex wordIndex,
+        plasmaWordIndex wordIndex,
-            plasmaCrawlResults crawlResults,
+        plasmaCrawlResults crawlResults,
-            TreeMap<String, String> preselectedPeerHashes,
+        TreeMap<String, String> preselectedPeerHashes,
-            boolean generateAbstracts) {
+        boolean generateAbstracts) {
-        synchronized (lastEvents) {
+        plasmaSearchEvent event = (plasmaSearchEvent) lastEvents.get(query.id(false));
-            plasmaSearchEvent event = (plasmaSearchEvent) lastEvents.get(query.id(false));
+        if (event == null) {
-            if (event == null) {
+            event = new plasmaSearchEvent(query, wordIndex, crawlResults, preselectedPeerHashes, generateAbstracts);
-                event = new plasmaSearchEvent(query, wordIndex, crawlResults, preselectedPeerHashes, generateAbstracts);
+        } else {
-            } else {
+            //re-new the event time for this event, so it is not deleted next time too early
-                //re-new the event time for this event, so it is not deleted next time too early
+            event.eventTime = System.currentTimeMillis();
-                event.eventTime = System.currentTimeMillis();
+            // replace the query, because this contains the current result offset
-                // replace the query, because this contains the current result offset
+            event.query = query;
-                event.query = query;
+        }
+    
+        // if a local crawl is ongoing, do another local search to enrich the current results with more
+        // entries that can possibly come out of the running crawl
+        if (plasmaSwitchboard.getSwitchboard().crawlQueues.noticeURL.size() > 0) {
+            synchronized (event.rankedCache) {
+                event.rankedCache.execQuery();
             }
+        }
         
-            // if a local crawl is ongoing, do another local search to enrich the current results with more
+        // if worker threads had been alive, but did not succeed, start them again to fetch missing links
-            // entries that can possibly come out of the running crawl
+        if ((query.onlineSnippetFetch) &&
-            if (plasmaSwitchboard.getSwitchboard().crawlQueues.noticeURL.size() > 0) {
+            (!event.anyWorkerAlive()) &&
-                synchronized (event.rankedCache) {
+            (((query.contentdom == plasmaSearchQuery.CONTENTDOM_IMAGE) && (event.images.size() + 30 < query.neededResults())) ||
-                    event.rankedCache.execQuery();
+             (event.result.size() < query.neededResults() + 10)) &&
-                }
+            (event.getRankingResult().getLocalResourceSize() + event.getRankingResult().getRemoteResourceSize() > event.result.size())) {
-            }
+            // set new timeout
-            
+            event.eventTime = System.currentTimeMillis();
-            // if worker threads had been alive, but did not succeed, start them again to fetch missing links
+            // start worker threads to fetch urls and snippets
-            if ((query.onlineSnippetFetch) &&
+            event.workerThreads = new resultWorker[workerThreadCount];
-                (!event.anyWorkerAlive()) &&
+            for (int i = 0; i < workerThreadCount; i++) {
-                (((query.contentdom == plasmaSearchQuery.CONTENTDOM_IMAGE) && (event.images.size() + 30 < query.neededResults())) ||
+                event.workerThreads[i] = event.deployWorker(i, 10000);
-                 (event.result.size() < query.neededResults() + 10)) &&
-                (event.getRankingResult().getLocalResourceSize() + event.getRankingResult().getRemoteResourceSize() > event.result.size())) {
-                // set new timeout
-                event.eventTime = System.currentTimeMillis();
-                // start worker threads to fetch urls and snippets
-                event.workerThreads = new resultWorker[workerThreadCount];
-                for (int i = 0; i < workerThreadCount; i++) {
-                    event.workerThreads[i] = event.deployWorker(i, 10000);
-                }
             }
-        
-            return event;
         }
-        
+    
+        return event;
     }
     
     private resultWorker deployWorker(int id, long lifetime) {