You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2015/02/19 16:36:23 UTC

svn commit: r1660914 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws: MachineInfo.java server/nodeviz/VisualizedHost.java

Author: challngr
Date: Thu Feb 19 15:36:23 2015
New Revision: 1660914

URL: http://svn.apache.org/r1660914
Log:
UIMA-4209 Update memory size to use getMemFree() in viz.  Fix MachineInfo to propertly
          return a value on getMemFree().

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java?rev=1660914&r1=1660913&r2=1660914&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java Thu Feb 19 15:36:23 2015
@@ -61,6 +61,7 @@ public class MachineInfo implements Comp
 		this.ip = ip;
 		this.name = name;
 		this.memTotal = memTotal;
+		this.memFree = memFree;
 		this.swapInuse = swapInuse;
 		this.swapFree = swapFree;
 		this.cGroups = cGroups;

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java?rev=1660914&r1=1660913&r2=1660914&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java Thu Feb 19 15:36:23 2015
@@ -83,7 +83,7 @@ class VisualizedHost
             this.shares = 0;
             this.mem_reservable = 0;
         } else {
-            this.mem = Integer.parseInt(info.getMemTotal());
+            this.mem = Integer.parseInt(info.getMemFree());
             this.shares = (mem / quantum);
             this.mem_reservable = shares * quantum;
         }