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 2014/11/20 19:02:53 UTC

svn commit: r1640775 - /uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java

Author: challngr
Date: Thu Nov 20 18:02:52 2014
New Revision: 1640775

URL: http://svn.apache.org/r1640775
Log:
UIMA-4114 Set correct free memory on OSX from -D in simulation.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java?rev=1640775&r1=1640774&r2=1640775&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java Thu Nov 20 18:02:52 2014
@@ -62,7 +62,11 @@ public class DefaultNodeMemoryCollector 
 			  e.printStackTrace();
 		  }
 		  if ( metricName.equalsIgnoreCase(FREE_PHYSICAL_MEMORY_SIZE)) {
-			  nodeMemory.setMemFree(metricValue);
+              if ( fakeMemorySize != -1 ) {               // UIMA-4114
+                  nodeMemory.setMemFree(fakeMemorySize);
+              } else {
+                  nodeMemory.setMemFree(metricValue);
+              }
 		  } else if ( metricName.equalsIgnoreCase(FREE_SWAP_MEMORY_SIZE)) {
 			  nodeMemory.setSwapFree(metricValue);
 		  } else if ( metricName.equalsIgnoreCase(TOTAL_SWAP_SPACE_SIZE)) {