[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3684] trunk/py/scripts/tools/bi_farm: sort non running jobs first

[Campbell Barton]

Revision: 3684
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3684
Author:   campbellbarton
Date:     2012-08-23 09:40:51 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
sort non running jobs first

Modified Paths:
--------------
    trunk/py/scripts/tools/bi_farm/master_ui.py
    trunk/py/scripts/tools/bi_farm/new_master.py

Modified: trunk/py/scripts/tools/bi_farm/master_ui.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/master_ui.py	2012-08-22 14:18:02 UTC (rev 3683)
+++ trunk/py/scripts/tools/bi_farm/master_ui.py	2012-08-23 09:40:51 UTC (rev 3684)
@@ -136,7 +136,7 @@
         # (0 == if no jobs are done)
         # this way first priority is to get at least one frame rendering
         # from each job, this means we get an ETA
-        return ((self.image_done > 0), -self.priority_types.index(self.priority))
+        return -self.priority_types.index(self.priority)
 
 
 def job_set_enabled(id, enabled):

Modified: trunk/py/scripts/tools/bi_farm/new_master.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_master.py	2012-08-22 14:18:02 UTC (rev 3683)
+++ trunk/py/scripts/tools/bi_farm/new_master.py	2012-08-23 09:40:51 UTC (rev 3684)
@@ -260,7 +260,11 @@
         if job.enabled:
             sorted_jobs.append(job)
 
-    sorted_jobs.sort(key=lambda job: job.sortkey())
+    # get all running jobs in a set
+    running_jobs = set([slave_job for slave_job, slave_frames, slave_func_nr in slaves_state.values()])
+
+    # sort non running jobs first
+    sorted_jobs.sort(key=lambda job: (job in running_jobs, job.sortkey()))
     skipped_final = False
 
     r_job = None