svn commit: r1468481 - /uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java

[cw...@apache.org]

Author: cwiklik
Date: Tue Apr 16 16:00:46 2013
New Revision: 1468481

URL: http://svn.apache.org/r1468481
Log:
UIMA-2804 removed calculateMemoryAssignment()

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java?rev=1468481&r1=1468480&r2=1468481&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java Tue Apr 16 16:00:46 2013
@@ -36,7 +36,6 @@ import org.apache.uima.ducc.transport.di
 import org.apache.uima.ducc.transport.event.DuccEvent;
 import org.apache.uima.ducc.transport.event.DuccJobsStateEvent;
 import org.apache.uima.ducc.transport.event.PmStateDuccEvent;
-import org.apache.uima.ducc.transport.event.common.CGroup;
 import org.apache.uima.ducc.transport.event.common.DuccJobDeployment;
 import org.apache.uima.ducc.transport.event.common.DuccUimaDeploymentDescriptor;
 import org.apache.uima.ducc.transport.event.common.DuccUserReservation;
@@ -46,8 +45,8 @@ import org.apache.uima.ducc.transport.ev
 import org.apache.uima.ducc.transport.event.common.IDuccJobDeployment;
 import org.apache.uima.ducc.transport.event.common.IDuccProcess;
 import org.apache.uima.ducc.transport.event.common.IDuccReservationMap;
-import org.apache.uima.ducc.transport.event.common.IDuccWork;
 import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
+import org.apache.uima.ducc.transport.event.common.IDuccWork;
 import org.apache.uima.ducc.transport.event.common.ProcessMemoryAssignment;
 
 /**
@@ -117,29 +116,6 @@ implements ProcessManager {
 	    if ( (normalizedProcessMemoryRequirements % shareQuantum) > 0 ) shares++; // ciel
 	    return shares;
 	}
-	private long calculateProcessMemoryAssignment( String processMemoryAssignment, MemoryUnits units) {
-      //  Get user defined memory assignment for the JP
-      long normalizedProcessMemoryRequirements = normalizeMemory(processMemoryAssignment,units);
-    
-//            Long.parseLong(processMemoryAssignment);
-//    // Normalize memory requirements for JPs into Gigs 
-//    if ( units.equals(MemoryUnits.KB ) ) {
-//      normalizedProcessMemoryRequirements = (int)normalizedProcessMemoryRequirements/(1024*1024);
-//    } else if ( units.equals(MemoryUnits.MB ) ) {
-//      normalizedProcessMemoryRequirements = (int)normalizedProcessMemoryRequirements/1024;
-//    } else if ( units.equals(MemoryUnits.GB ) ) {
-//      //  already normalized
-//    } else if ( units.equals(MemoryUnits.TB ) ) {
-//      normalizedProcessMemoryRequirements = (int)normalizedProcessMemoryRequirements*1024;
-//    }
-    int shares = (int)normalizedProcessMemoryRequirements/shareQuantum;  // get number of shares
-    if ( (normalizedProcessMemoryRequirements % shareQuantum) > 0 ) shares++; // ciel
-    // normalize to get process memory in terms of Megs
-    long processAdjustedMemorySize = shares * shareQuantum * 1024;  
-    //  add fudge factor (5% default)  to adjusted memory computed above 
-    //processAdjustedMemorySize += (processAdjustedMemorySize * ((double)fudgeFactor/100));        
-    return processAdjustedMemorySize;
-	}
 
 	public void dispatchStateUpdateToAgents(ConcurrentHashMap<DuccId, IDuccWork> workMap) {
     String methodName="dispatchStateUpdateToAgents";