svn commit: r1746323 - /uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/node/metrics/NodeCpuInfo.java

[cwiklik]

Author: cwiklik
Date: Tue May 31 19:09:30 2016
New Revision: 1746323

URL: http://svn.apache.org/viewvc?rev=1746323&view=rev
Log:
UIMA-4948 changed constructor and remove code computing the load

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/node/metrics/NodeCpuInfo.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/node/metrics/NodeCpuInfo.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/node/metrics/NodeCpuInfo.java?rev=1746323&r1=1746322&r2=1746323&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/node/metrics/NodeCpuInfo.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/node/metrics/NodeCpuInfo.java
 Tue May 31 19:09:30 2016
@@ -18,8 +18,6 @@
  */
 package org.apache.uima.ducc.common.node.metrics;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.io.Serializable;
 
 public class NodeCpuInfo implements Serializable {
@@ -27,13 +25,10 @@ public class NodeCpuInfo implements Seri
        private String availableProcessors = "0";
     private String currentLoad = "0.0";
     
-       public NodeCpuInfo(int availableProcessors) {
+       public NodeCpuInfo(int availableProcessors, String cpu) {
                setAvailableProcessors(String.valueOf(availableProcessors));
-               try {
-                       currentLoad = String.valueOf(getCPULoad());
-               } catch( Exception e) {
-                       e.printStackTrace();
-               }
+               currentLoad = cpu;
+
        }
     public String getCurrentLoad() {
        return currentLoad;
@@ -46,43 +41,5 @@ public class NodeCpuInfo implements Seri
                this.availableProcessors = availableProcessors;
        }
 
-       private double getCPULoad() throws Exception {
-               double cpu = 0.0;
-               InputStreamReader in = null;
-               String[] command = {
-                               "/bin/sh",
-                               "-c",
-                               "/bin/grep 'cpu' /proc/stat | /bin/awk 
'{usage=($2+$4)*100/($2+$4+$5)} END {print usage}'" };
-               try {
-                       ProcessBuilder pb = new ProcessBuilder();
-                       pb.command(command);
-
-                       pb.redirectErrorStream(true);
-                       Process swapCollectorProcess = pb.start();
-                       in = new 
InputStreamReader(swapCollectorProcess.getInputStream());
-                       BufferedReader reader = new BufferedReader(in);
-                       String line = null;
-                       while ((line = reader.readLine()) != null) {
-                               System.out.println(line);
-                               try {
-                                       cpu = Double.parseDouble(line.trim());
-                               } catch (NumberFormatException e) {
-                                       cpu = 0;
-                                       e.printStackTrace();
-                               }
-                       }
-               } catch (Exception e) {
-                       throw e;
-               } finally {
-                       if (in != null) {
-                               try {
-                                       in.close();
-                               } catch (Exception e) {
-                               }
-
-                       }
-               }
 
-               return cpu;
-       }
 }