From 3838d16750e5f2b51c716a5c320acf0347e028e5 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 13 Sep 2007 06:53:40 +0000
Subject: [PATCH] - client: restore <slot> element on GUI RPC result XML    
 (needed by BOINCSpy) - client: CPU sched fix

svn path=/trunk/boinc/; revision=13584
---
 checkin_notes      | 9 +++++++++
 client/app.C       | 2 ++
 client/cpu_sched.C | 9 ++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 8aa55d53e6..6346193d7b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8450,3 +8450,12 @@ David  12 Sept 2007
 		BOINCTaskBar.cpp
 	lib/
 		str_util.C
+
+David  13 Sept 2007
+    - client: restore <slot> element on GUI RPC result XML
+        (needed by BOINCSpy)
+    - client: CPU sched fix
+
+    client/
+        app.C
+        cpu_sched.C
diff --git a/client/app.C b/client/app.C
index 691c9bd23b..317f1e9ea6 100644
--- a/client/app.C
+++ b/client/app.C
@@ -462,6 +462,7 @@ int ACTIVE_TASK::write_gui(MIOFILE& fout) {
         "<active_task>\n"
         "    <active_task_state>%d</active_task_state>\n"
         "    <app_version_num>%d</app_version_num>\n"
+        "    <slot>%d</slot>\n"
         "    <scheduler_state>%d</scheduler_state>\n"
         "    <checkpoint_cpu_time>%f</checkpoint_cpu_time>\n"
         "    <fraction_done>%f</fraction_done>\n"
@@ -474,6 +475,7 @@ int ACTIVE_TASK::write_gui(MIOFILE& fout) {
         "%s",
         task_state(),
         app_version->version_num,
+        slot,
         scheduler_state,
         checkpoint_cpu_time,
         fraction_done,
diff --git a/client/cpu_sched.C b/client/cpu_sched.C
index 2cc0e960d3..7fd130114a 100644
--- a/client/cpu_sched.C
+++ b/client/cpu_sched.C
@@ -211,11 +211,14 @@ RESULT* CLIENT_STATE::earliest_deadline_result() {
         if (!best_result || rp->report_deadline<best_result->report_deadline) {
             best_result = rp;
             best_atp = atp;
+            continue;
+        }
+        if (rp->report_deadline > best_result->report_deadline) {
+            continue;
         }
-        if (rp->report_deadline > best_result->report_deadline) continue;
 
-        // If there's a tie, pick the one with the least remaining CPU time
-        // (but don't pick an unstarted job in preference to one that's started)
+        // If there's a tie, pick the job with the least remaining CPU time
+        // (but don't pick an unstarted job over one that's started)
         //
         if (best_atp && !atp) continue;
         if (rp->estimated_cpu_time_remaining(false)