From 17e0956312a1c5506bad12ac33e37f23bf6b5aff Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Fri, 11 Apr 2014 09:25:18 +0200
Subject: [PATCH] refactoring of SystemLoad calls (only one backend tool)

---
 source/net/yacy/kelondro/util/MemoryControl.java          | 8 --------
 source/net/yacy/kelondro/workflow/AbstractBusyThread.java | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/source/net/yacy/kelondro/util/MemoryControl.java b/source/net/yacy/kelondro/util/MemoryControl.java
index 6dae52721..669990ae7 100644
--- a/source/net/yacy/kelondro/util/MemoryControl.java
+++ b/source/net/yacy/kelondro/util/MemoryControl.java
@@ -178,14 +178,6 @@ public class MemoryControl {
     public static void setProperMbyte(final long mbyte) {
     	getStrategy().setProperMbyte(mbyte);
     }
-    
-    /**
-     * get the system load within the last minute
-     * @return the system load or a negative number if the load is not available
-     */
-    public static double load() {
-        return ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();
-    }
 
     /**
      * main
diff --git a/source/net/yacy/kelondro/workflow/AbstractBusyThread.java b/source/net/yacy/kelondro/workflow/AbstractBusyThread.java
index 74be153cf..dbe721aad 100644
--- a/source/net/yacy/kelondro/workflow/AbstractBusyThread.java
+++ b/source/net/yacy/kelondro/workflow/AbstractBusyThread.java
@@ -26,8 +26,8 @@ package net.yacy.kelondro.workflow;
 
 import java.net.SocketException;
 
-
 import net.yacy.cora.util.ConcurrentLog;
+import net.yacy.cora.util.Memory;
 import net.yacy.kelondro.util.MemoryControl;
 
 
@@ -178,8 +178,8 @@ public abstract class AbstractBusyThread extends AbstractThread implements BusyT
                 ratz(this.idlePause);
                 idletime += System.currentTimeMillis() - timestamp;
             //} else if ((memnow = serverMemory.available()) > memprereq) try {
-            } else if (MemoryControl.load() > loadprereq) {
-            	logSystem("Thread '" + this.getName() + "' runs high load cycle. current: " + MemoryControl.load() + " max.: " + loadprereq);
+            } else if (Memory.load() > loadprereq) {
+            	logSystem("Thread '" + this.getName() + "' runs high load cycle. current: " + Memory.load() + " max.: " + loadprereq);
                 timestamp = System.currentTimeMillis();
                 ratz(this.idlePause);
                 idletime += System.currentTimeMillis() - timestamp;