- client: fix bug with --abort_jobs_on_exit that caused the client

to request new work on exit
- client: change "unparsed tag" to "unrecognized tag" in msgs
- client: get rid of unused var work_fetch_no_new_work

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

checkin_notes

@@ -5212,3 +5212,18 @@ David  16 Jul 2010
         feeder.cpp
     tools/
         backend_lib.cpp
+
+David  19 Jul 2010
+    - client: fix bug with --abort_jobs_on_exit that caused the client
+        to request new work on exit
+    - client: change "unparsed tag" to "unrecognized tag" in msgs
+    - client: get rid of unused var work_fetch_no_new_work
+
+    client/
+        client_types.h
+        client_state.cpp,h
+        sim.h
+        cs_statefile.cpp
+        log_flags.cpp
+    lib/
+        coproc.cpp

client/client_state.cpp

@@ -120,7 +120,6 @@ CLIENT_STATE::CLIENT_STATE():
     executing_as_daemon = false;
     redirect_io = false;
     disable_graphics = false;
-    work_fetch_no_new_work = false;
     cant_write_state_file = false;
 
     debt_interval_start = 0;
@@ -1815,6 +1814,7 @@ void CLIENT_STATE::start_abort_sequence() {
     for (i=0; i<projects.size(); i++) {
         PROJECT* p = projects[i];
         p->min_rpc_time = 0;
+        p->dont_request_more_work = true;
     }
 }
 

client/client_state.h

@@ -260,7 +260,6 @@ private:
     double fetchable_resource_share();
     double debt_interval_start;
     double total_cpu_time_this_debt_interval;
-    bool work_fetch_no_new_work;
     bool must_enforce_cpu_schedule;
     bool must_schedule_cpus;
     bool must_check_work_fetch;

client/client_types.h

@@ -334,6 +334,10 @@ struct PROJECT {
         // This is dynamically updated in a way that maintains an upper bound.
         // it goes down slowly but if a new estimate X is larger,
         // the factor is set to X.
+        //
+        // Deprecated - current server logic handles this,
+        // and this should go to 1.
+        // But we need to keep it around for older projects
     void update_duration_correction_factor(ACTIVE_TASK*);
     
     // fields used by CPU scheduler and work fetch

client/cs_statefile.cpp

@@ -446,10 +446,6 @@ int CLIENT_STATE::parse_state_file() {
             run_cpu_benchmarks = true;
             continue;
         }
-        if (match_tag(buf, "<work_fetch_no_new_work/>")) {
-            work_fetch_no_new_work = true;
-            continue;
-        }
         if (match_tag(buf, "<proxy_info>")) {
             retval = gui_proxy_info.parse(mf);
             if (retval) {

client/log_flags.cpp

@@ -456,7 +456,7 @@ int CONFIG::parse(FILE* f) {
         }
         msg_printf(NULL, MSG_USER_ALERT,
             "%s %s: <%s>",
-            _("Unparsed tag in"),
+            _("Unrecognized tag in"),
             CONFIG_FILE,
             tag
         );

client/sim.h

@@ -179,7 +179,6 @@ private:
     double fetchable_resource_share();
     double total_cpu_time_this_debt_interval;
     double cpu_shortfall;
-    bool work_fetch_no_new_work;
     bool must_enforce_cpu_schedule;
     bool must_schedule_cpus;
     bool must_check_work_fetch;

lib/coproc.cpp

@@ -151,10 +151,6 @@ void COPROCS::write_xml(MIOFILE& mf) {
 #endif
 }
 
-#ifdef _WIN32
-
-#endif
-
 void COPROC_CUDA::description(char* buf) {
     char vers[256];
     if (display_driver_version) {