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

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

Author: borja
Date: 2010-01-12 17:44:21 -0600 (Tue, 12 Jan 2010)
New Revision: 753

Modified:
   branches/1.1/src/haizea/core/leases.py
Log:
Fixed: Initial estimation of the time to suspend/resume was too big (scheduled time was still ok)

Modified: branches/1.1/src/haizea/core/leases.py
===================================================================
--- branches/1.1/src/haizea/core/leases.py	2010-01-10 22:50:24 UTC (rev 752)
+++ branches/1.1/src/haizea/core/leases.py	2010-01-12 23:44:21 UTC (rev 753)
@@ -683,10 +683,10 @@
         for vnode in self.requested_resources:
             mem += self.requested_resources[vnode].get_quantity(RES_MEM)
         if susp_exclusion == SUSPRES_EXCLUSION_GLOBAL:
-            return self.numnodes * (compute_suspend_resume_time(mem, rate) + enactment_overhead)
+            return self.numnodes * enactment_overhead + compute_suspend_resume_time(mem, rate)
         elif susp_exclusion == SUSPRES_EXCLUSION_LOCAL:
             # Overestimating
-            return self.numnodes * (compute_suspend_resume_time(mem, rate) + enactment_overhead)            
+            return self.numnodes * enactment_overhead + compute_suspend_resume_time(mem, rate)
         
 class LeaseStateMachine(StateMachine):
     """A lease state machine