[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/icecream/icecream/services
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-01-10 14:23:25
Message-ID: 1136903005.394267.31784.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 496458 by coolo:

we decided we should do this more sane


 M  +11 -12    scheduler.cpp  


--- trunk/kdenonbeta/icecream/icecream/services/scheduler.cpp #496457:496458
@@ -725,16 +725,12 @@
 	     idea about their speed.  */
 	  if (envs_match (cs, job))
 	    best = cs;
-	  else {
-            // if there is one server that already got the environment and one that
-            // hasn't compiled at all, pick the one with environment first
-	    bestui = cs;
-
-            // to make sure we find the fast computers at least after some time, we overwrite
-            // the above rule for every 7th job
-            if ( job->id % 7 == 0 )
-              best = 0;
-          }
+	  else
+            {
+              // if there is one server that already got the environment and one that
+              // hasn't compiled at all, pick the one with environment first
+              bestui = cs;
+            }
 	  break;
 	}
 
@@ -762,7 +758,10 @@
         }
     }
 
-  if ( best ) {
+  // to make sure we find the fast computers at least after some time, we overwrite
+  // the install rule for every 19th job
+  if ( best && job->id % 19 != 0 )
+    {
 #if DEBUG_SCHEDULER > 1
     trace() << "taking best installed " << best->nodename << " " <<  server_speed (best) << endl;
 #endif
@@ -820,7 +819,7 @@
        it != done_jobs.end(); ++it)
     {
       Job *j = it->second;
-      if (j->done_time - now > 30 )
+      if (now - j->done_time > 30 )
         {
           trace() << "undone " << dump_job( j ) << endl;
           trace() << "FORCED removing " << j->server->nodename << endl;
[prev in list] [next in list] [prev in thread] [next in thread]