*** empty log message ***

svn path=/trunk/boinc/; revision=2314

checkin_notes

@@ -6233,8 +6233,13 @@ Karl 2003/09/07
 
     html_user/*.php, *.inc
 
-Karl 2003/09/07
     - changed "Results uploaded" to "Outputs uploaded"
 
-    clients/
+    client/
         gui_titles.C
+
+    - use rsc_fpops_bound instead of rsc_fpops_est*2
+
+    client/
+        app.C
+        client_types.C

client/app.C

@@ -123,7 +123,7 @@ int ACTIVE_TASK::init(RESULT* rp) {
     result = rp;
     wup = rp->wup;
     app_version = wup->avp;
-    max_cpu_time = gstate.estimate_cpu_time(*rp->wup)*2;
+    max_cpu_time = rp->wup->rsc_fpops_bound/gstate.host_info.p_fpops;
     max_disk_usage = rp->wup->rsc_disk_bound;
     max_mem_usage = rp->wup->rsc_memory_bound;
 
@@ -482,7 +482,7 @@ pid_t wait4(pid_t pid, int *statusp, int options, struct rusage *rusagep) {
       proc_info.erase(pid);
       return pid;
     }
-  }    
+  }
 }
 #endif
 

client/client_state.C

@@ -516,14 +516,16 @@ int CLIENT_STATE::current_disk_usage(double& size) {
     return dir_size(".", size);
 }
 
-// estimate how long a WU will take on this host
-//
-double CLIENT_STATE::estimate_cpu_time(WORKUNIT& wu) {
-    double x;
+// TODO: remove delete these
 
-    x = wu.rsc_fpops_est/host_info.p_fpops;
-    return x;
-}
+// // estimate how long a WU will take on this host
+// //
+// double CLIENT_STATE::estimate_cpu_time(WORKUNIT& wu) {
+//     double x;
+
+//     x = wu.rsc_fpops_est/host_info.p_fpops;
+//     return x;
+// }
 
 inline double force_fraction(double f) {
     if (f < 0) return 0;