Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

htroot/Status.java

@@ -32,6 +32,7 @@ import java.util.Date;
 
 import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.RequestHeader;
+import net.yacy.cora.util.Memory;
 import net.yacy.kelondro.io.ByteCount;
 import net.yacy.kelondro.util.Formatter;
 import net.yacy.kelondro.util.MemoryControl;
@@ -317,6 +318,7 @@ public class Status
         prop.put("totalMemory", Formatter.bytesToString(MemoryControl.total()));
         prop.put("maxMemory", Formatter.bytesToString(MemoryControl.maxMemory()));
         prop.put("processors", WorkflowProcessor.availableCPU);
+        prop.put("load", Memory.load());
 
         // proxy traffic
         //prop.put("trafficIn",bytesToString(httpdByteCountInputStream.getGlobalCount()));

htroot/Status_p.inc

@@ -3,18 +3,17 @@
   <legend>System Status</legend>
   <dl>
 
-    <dt>Process</dt>
-    <dd>#[versionpp]#
+    <dt>System</dt>
+    <dd>YaCy version #[versionpp]#
     #(peerStatistics)#
       Unknown
       ::
       <div>Uptime: #[uptime]#</div>
-      #(/peerStatistics)#
-      </dd>
-    
-    <dt>System Resources</dt>
-    <dd>Processors: #[processors]#</dd>
+    #(/peerStatistics)#
+    <div>Processors: #[processors]#</div>
+    <div>Load: #[load]#</div>
     
+    </dd>
     <dt>Protection</dt>
     <dd>#(protection)#
       <strong>Password is missing.</strong>

source/net/yacy/search/Switchboard.java

@@ -113,6 +113,7 @@ import net.yacy.cora.protocol.TimeoutRequest;
 import net.yacy.cora.protocol.http.HTTPClient;
 import net.yacy.cora.protocol.http.ProxySettings;
 import net.yacy.cora.util.ConcurrentLog;
+import net.yacy.cora.util.Memory;
 import net.yacy.crawler.CrawlStacker;
 import net.yacy.crawler.CrawlSwitchboard;
 import net.yacy.crawler.HarvestProcess;
@@ -2313,6 +2314,9 @@ public final class Switchboard extends serverSwitch {
             // these actions may also influence the search index/ call optimize steps
             execAPIActions();
             
+            // show deadlocks if there are any in the log
+            if (Memory.deadlocks() > 0) Memory.logDeadlocks();
+            
             return true;
         } catch ( final InterruptedException e ) {
             this.log.info("cleanupJob: Shutdown detected");