[haizea-commit] r431 - in trunk/src/haizea/resourcemanager: . frontends

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

Author: borja
Date: 2008-07-11 08:09:08 -0500 (Fri, 11 Jul 2008)
New Revision: 431

Modified:
   trunk/src/haizea/resourcemanager/frontends/tracefile.py
   trunk/src/haizea/resourcemanager/slottable.py
   trunk/src/haizea/resourcemanager/stats.py
Log:
Miscellaneous accumulated fixes

Modified: trunk/src/haizea/resourcemanager/frontends/tracefile.py
===================================================================
--- trunk/src/haizea/resourcemanager/frontends/tracefile.py	2008-07-10 16:58:55 UTC (rev 430)
+++ trunk/src/haizea/resourcemanager/frontends/tracefile.py	2008-07-11 13:09:08 UTC (rev 431)
@@ -47,7 +47,7 @@
             self.rm.logger.info("Loading injection file %s" % injectfile, constants.TRACE)
             injectedleases = tracereaders.LWF(injectfile, starttime)
             self.requests += injectedleases
-            self.requests.sort(key=operator.attrgetter("tSubmit"))
+            self.requests.sort(key=operator.attrgetter("submit_time"))
 
         if imagefile != None:
             self.rm.logger.info("Loading image file %s" % imagefile, constants.TRACE)

Modified: trunk/src/haizea/resourcemanager/slottable.py
===================================================================
--- trunk/src/haizea/resourcemanager/slottable.py	2008-07-10 16:58:55 UTC (rev 430)
+++ trunk/src/haizea/resourcemanager/slottable.py	2008-07-11 13:09:08 UTC (rev 431)
@@ -499,7 +499,7 @@
         if mustresume and not canmigrate:
             vmrr, susprr = lease.get_last_vmrr()
             curnodes = set(vmrr.nodes.values())
-            suspendthreshold = lease.getSuspendThreshold(initial=False, suspendrate=suspendresumerate, migrating=False)
+            suspendthreshold = lease.get_suspend_threshold(initial=False, suspendrate=suspendresumerate, migrating=False)
         
         if mustresume and canmigrate:
             # If we have to resume this lease, make sure that
@@ -613,7 +613,7 @@
 
         # Adjust times in case the lease has to be suspended/resumed
         if mustsuspend:
-            suspendtime = lease.estimateSuspendResumeTime(suspendresumerate)
+            suspendtime = lease.estimate_suspend_resume_time(suspendresumerate)
             end -= suspendtime
                 
         if mustresume:

Modified: trunk/src/haizea/resourcemanager/stats.py
===================================================================
--- trunk/src/haizea/resourcemanager/stats.py	2008-07-10 16:58:55 UTC (rev 430)
+++ trunk/src/haizea/resourcemanager/stats.py	2008-07-11 13:09:08 UTC (rev 431)
@@ -163,7 +163,7 @@
     
     def getNodesDoing(self):
         starttime = self.rm.clock.get_start_time()
-        nodes=dict([(i+1,[]) for i in range(self.rm.config.getNumPhysicalNodes())])
+        nodes=dict([(i+1,[]) for i in range(self.rm.resourcepool.getNumNodes())])
         for n in self.nodes:
             nodes[n] = []
             prevtime = None