[haizea-commit] r781 - branches/1.1/src/haizea/pluggable/policies

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

Author: borja
Date: 2010-01-19 15:48:01 -0600 (Tue, 19 Jan 2010)
New Revision: 781

Modified:
   branches/1.1/src/haizea/pluggable/policies/preemption.py
Log:
Modified lease preemptability score for deadline leases.

Modified: branches/1.1/src/haizea/pluggable/policies/preemption.py
===================================================================
--- branches/1.1/src/haizea/pluggable/policies/preemption.py	2010-01-19 21:47:38 UTC (rev 780)
+++ branches/1.1/src/haizea/pluggable/policies/preemption.py	2010-01-19 21:48:01 UTC (rev 781)
@@ -114,9 +114,9 @@
 
             deadline = preemptee.deadline
             remaining_duration = preemptee.get_remaining_duration_at(time)
-            slack = (deadline - time) / remaining_duration
             delay = preemptee.estimate_suspend_time() + preemptor.duration.requested + preemptee.estimate_resume_time()
             if time + delay + remaining_duration < deadline:
+                slack = (deadline - (time+delay)) / remaining_duration
                 return slack
             else:
                 return -1
\ No newline at end of file