[haizea-commit] r809 - branches/1.1/src/haizea/core

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-06-22 16:36:17 -0500 (Tue, 22 Jun 2010)
New Revision: 809

Modified:
   branches/1.1/src/haizea/core/leases.py
Log:
Another error-propagation bug in estimating times.

Modified: branches/1.1/src/haizea/core/leases.py
===================================================================
--- branches/1.1/src/haizea/core/leases.py	2010-06-22 19:37:28 UTC (rev 808)
+++ branches/1.1/src/haizea/core/leases.py	2010-06-22 21:36:17 UTC (rev 809)
@@ -762,14 +762,12 @@
         """              
         susp_exclusion = get_config().get("suspendresume-exclusion")        
         enactment_overhead = get_config().get("enactment-overhead") 
-        mem = 0
+        time = 0
         for vnode in self.requested_resources:
-            mem += self.requested_resources[vnode].get_quantity(RES_MEM)
-        if susp_exclusion == SUSPRES_EXCLUSION_GLOBAL:
-            return self.numnodes * enactment_overhead + compute_suspend_resume_time(mem, rate)
-        elif susp_exclusion == SUSPRES_EXCLUSION_LOCAL:
-            # Overestimating
-            return self.numnodes * enactment_overhead + compute_suspend_resume_time(mem, rate)
+            mem = self.requested_resources[vnode].get_quantity(RES_MEM)
+            # Overestimating when susp_exclusion == SUSPRES_EXCLUSION_LOCAL
+            time += compute_suspend_resume_time(mem, rate) + enactment_overhead
+        return time
         
     # ONLY for simulation
     def _update_prematureend(self):