From 78e0c57adb369099c4e1ce55b9c94e3c21e19e38 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 23 Aug 2006 16:43:14 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10986 --- checkin_notes | 11 +++++++++++ client/cs_cmdline.C | 2 -- lib/boinc_cmd.C | 1 + lib/prefs.C | 25 ++++--------------------- lib/prefs.h | 5 ----- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/checkin_notes b/checkin_notes index 122721767a..78f4dac322 100755 --- a/checkin_notes +++ b/checkin_notes @@ -9197,3 +9197,14 @@ David 22 Aug 2006 Rom 22 Aug 2006 - Tag for 5.5.15 release, all platforms boinc_core_release_5_5_15 + +David 23 Aug 2006 + - removed "max_memory_nbytes, "proc_priority", "cpu_affinity", + "run_minimized" and "run_on_startup" from global prefs; + not used anywhere. + + client/ + cs_cmdline.C + lib/ + boinc_cmd.C + prefs.C,h diff --git a/client/cs_cmdline.C b/client/cs_cmdline.C index 8e09f5cdf2..345be43f34 100644 --- a/client/cs_cmdline.C +++ b/client/cs_cmdline.C @@ -89,8 +89,6 @@ void CLIENT_STATE::parse_cmdline(int argc, char** argv) { } else if (ARG(file_xfer_giveup_period)) { if (i == argc-1) show_options = true; else file_xfer_giveup_period = atoi(argv[++i]); - } else if (ARG(min)) { - global_prefs.run_minimized = true; } else if (ARG(suspend)) { user_run_request = USER_RUN_REQUEST_NEVER; } else if (ARG(saver)) { diff --git a/lib/boinc_cmd.C b/lib/boinc_cmd.C index f5b220c307..39d51b4534 100644 --- a/lib/boinc_cmd.C +++ b/lib/boinc_cmd.C @@ -454,6 +454,7 @@ int main(int argc, char** argv) { } else if (!strcmp(cmd, "--test4")) { GLOBAL_PREFS p; memset(&p, 0, sizeof(p)); + p.defaults(); p.max_cpus = 2; retval = rpc.set_global_prefs_override_struct(p); printf("retval %d\n", retval); diff --git a/lib/prefs.C b/lib/prefs.C index aed034e813..b3906bcb37 100644 --- a/lib/prefs.C +++ b/lib/prefs.C @@ -45,8 +45,6 @@ void GLOBAL_PREFS::defaults() { end_hour = 0; net_start_hour = 0; net_end_hour = 0; - run_minimized = false; - run_on_startup = false; leave_apps_in_memory = false; confirm_before_connecting = true; hangup_if_dialed = false; @@ -62,13 +60,12 @@ void GLOBAL_PREFS::defaults() { idle_time_to_run = 3; max_bytes_sec_up = 1e9; max_bytes_sec_down = 1e9; - //max_memory_mbytes = 128; - proc_priority = 1; - cpu_affinity = -1; cpu_usage_limit = 100; // don't initialize source_project, source_scheduler here - // since they are outside of elements + // since they are outside of elements, + // and this is called when find the right venue. + // Also, don't memset to 0 } // before parsing @@ -77,8 +74,6 @@ void GLOBAL_PREFS::clear_bools() { run_if_user_active = false; leave_apps_in_memory = false; confirm_before_connecting = false; - run_minimized = false; - run_on_startup = false; hangup_if_dialed = false; dont_verify_images = false; } @@ -178,10 +173,6 @@ int GLOBAL_PREFS::parse_override( continue; } else if (xp.parse_bool(tag, "hangup_if_dialed", hangup_if_dialed)) { continue; - } else if (xp.parse_bool(tag, "run_minimized", run_minimized)) { - continue; - } else if (xp.parse_bool(tag, "run_on_startup", run_on_startup)) { - continue; } else if (xp.parse_bool(tag, "dont_verify_images", dont_verify_images)) { continue; } else if (xp.parse_double(tag, "work_buf_min_days", work_buf_min_days)) { @@ -211,12 +202,6 @@ int GLOBAL_PREFS::parse_override( } else if (xp.parse_double(tag, "max_bytes_sec_down", max_bytes_sec_down)) { if (max_bytes_sec_down <= 0) max_bytes_sec_down = 1e12; continue; -#if 0 - } else if (xp.parse_int(tag, "max_memory_mbytes", max_memory_mbytes)) { - continue; -#endif - } else if (xp.parse_int(tag, "cpu_affinity", cpu_affinity)) { - continue; } else if (xp.parse_double(tag, "cpu_usage_limit", dtemp)) { if (dtemp > 0 && dtemp <= 100) { cpu_usage_limit = dtemp; @@ -255,7 +240,7 @@ int GLOBAL_PREFS::write(MIOFILE& f) { " %d\n" " %d\n" " %d\n" - "%s%s%s%s%s%s" + "%s%s%s%s" " %f\n" " %d\n" " %f\n" @@ -277,8 +262,6 @@ int GLOBAL_PREFS::write(MIOFILE& f) { net_end_hour, leave_apps_in_memory?" \n":"", confirm_before_connecting?" \n":"", - run_minimized?" \n":"", - run_on_startup?" \n":"", hangup_if_dialed?" \n":"", dont_verify_images?" \n":"", work_buf_min_days, diff --git a/lib/prefs.h b/lib/prefs.h index 4208200b17..3800ec80d9 100644 --- a/lib/prefs.h +++ b/lib/prefs.h @@ -43,8 +43,6 @@ struct GLOBAL_PREFS { int net_end_hour; bool leave_apps_in_memory; bool confirm_before_connecting; - bool run_minimized; - bool run_on_startup; bool hangup_if_dialed; bool dont_verify_images; double work_buf_min_days; @@ -58,9 +56,6 @@ struct GLOBAL_PREFS { double idle_time_to_run; double max_bytes_sec_up; double max_bytes_sec_down; - //int max_memory_mbytes; - int proc_priority; - int cpu_affinity; double cpu_usage_limit; char source_project[256]; char source_scheduler[256];