From 2170b45d41aca576565672c32df2c8a18bfec17d Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 11 Jan 2009 05:14:47 +0000
Subject: [PATCH] - client: work_req_seconds is CPU req, not max(CPU req, CUDA
 req). 	In order to work with the 6.7 client, 	projects with both CUDA and
 CPU jobs must use the newest scheduler code.

svn path=/trunk/boinc/; revision=16868
---
 checkin_notes         |  8 ++++++++
 client/work_fetch.cpp | 31 ++-----------------------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 433e048e92..5dbf67da43 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -116,3 +116,11 @@ Charlie Jan 10 2009
     mac_installer/
         release_GridRepublic.sh
         release_boinc.sh
+
+David  Jan 10 2009
+	- client: work_req_seconds is CPU req, not max(CPU req, CUDA req).
+		In order to work with the 6.7 client,
+		projects with both CUDA and CPU jobs must use the newest scheduler code.
+
+	client/
+		work_fetch.cpp
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 141dd0eedb..902914dc1c 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -99,25 +99,6 @@ void RSC_WORK_FETCH::accumulate_shortfall(double d_time, double nused) {
     }
 }
 
-#if 0
-void RSC_PROJECT_WORK_FETCH::accumulate_shortfall(
-    RSC_WORK_FETCH& rwf,
-    PROJECT* p,
-    double d_time,
-    double nused
-) {
-    double rsf = rwf.total_resource_share?p->resource_share/rwf.total_resource_share:1;
-    double share = rwf.ninstances * rsf;
-    printf("proj acc sho %s: rsf %f share %f nused %f dt %f\n",
-        p->project_name, rsf, share, nused, d_time
-    );
-    double x = share - nused;
-    if (x > 0) {
-        shortfall += d_time * x;
-    }
-}
-#endif
-
 // choose the best project to ask for work for this resource
 //
 PROJECT* RSC_WORK_FETCH::choose_project() {
@@ -393,22 +374,14 @@ bool RSC_PROJECT_WORK_FETCH::debt_eligible(PROJECT* p) {
 }
 
 void WORK_FETCH::write_request(FILE* f) {
-    double work_req_seconds = cpu_work_fetch.req_secs;
     fprintf(f,
+        "    <work_req_seconds>%f</work_req_seconds>\n"
         "    <cpu_req_secs>%f</cpu_req_secs>\n"
         "    <cpu_req_instances>%d</cpu_req_instances>\n",
         cpu_work_fetch.req_secs,
+        cpu_work_fetch.req_secs,
         cpu_work_fetch.req_instances
     );
-    if (coproc_cuda) {
-        if (cuda_work_fetch.req_secs > work_req_seconds) {
-            work_req_seconds = cuda_work_fetch.req_secs;
-        }
-    }
-    fprintf(f,
-        "    <work_req_seconds>%f</work_req_seconds>\n",
-        work_req_seconds
-    );
 }
 
 // we just got a scheduler reply with the given jobs; update backoffs