From 81faa12ff376fe6b7b671ec08f3a82e377961e7a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 8 Jul 2014 12:35:45 -0700 Subject: [PATCH] scheduler: make matchmaker scheduling the default Remove config option; add option. --- sched/sched_config.cpp | 4 +--- sched/sched_config.h | 4 +--- sched/sched_customize.cpp | 4 ---- sched/sched_main.cpp | 2 +- sched/sched_score.cpp | 3 +-- sched/sched_send.cpp | 12 ++++++------ 6 files changed, 10 insertions(+), 19 deletions(-) diff --git a/sched/sched_config.cpp b/sched/sched_config.cpp index 15d1a522e2..e1d9c1175c 100644 --- a/sched/sched_config.cpp +++ b/sched/sched_config.cpp @@ -228,7 +228,7 @@ int SCHED_CONFIG::parse(FILE* f) { } continue; } - if (xp.parse_bool("matchmaker", matchmaker)) continue; + if (xp.parse_bool("sched_old", sched_old)) continue; if (xp.parse_int("max_ncpus", max_ncpus)) continue; if (xp.parse_int("max_wus_in_progress", itemp)) { max_jobs_in_progress.project_limits.proc_type_limits[PROC_TYPE_CPU].base_limit = itemp; @@ -264,8 +264,6 @@ int SCHED_CONFIG::parse(FILE* f) { } if (xp.parse_int("min_core_client_upgrade_deadline", min_core_client_upgrade_deadline)) continue; if (xp.parse_int("min_sendwork_interval", min_sendwork_interval)) continue; - if (xp.parse_int("mm_min_slots", mm_min_slots)) continue; - if (xp.parse_int("mm_max_slots", mm_max_slots)) continue; if (xp.parse_double("next_rpc_delay", next_rpc_delay)) continue; if (xp.parse_bool("no_amd_k6", no_amd_k6)) { if (no_amd_k6) { diff --git a/sched/sched_config.h b/sched/sched_config.h index f851b86859..1a2d1c34d4 100644 --- a/sched/sched_config.h +++ b/sched/sched_config.h @@ -122,7 +122,7 @@ struct SCHED_CONFIG { int locality_scheduling_send_timeout; vector *locality_scheduling_workunit_file; vector *locality_scheduling_sticky_file; - bool matchmaker; + bool sched_old; int max_download_urls_per_file; int max_ncpus; JOB_LIMITS max_jobs_in_progress; @@ -136,8 +136,6 @@ struct SCHED_CONFIG { int min_core_client_version_announced; int min_core_client_upgrade_deadline; int min_sendwork_interval; - int mm_min_slots; - int mm_max_slots; double next_rpc_delay; bool no_amd_k6; // don't allow AMD K6 CPUs diff --git a/sched/sched_customize.cpp b/sched/sched_customize.cpp index 949ab30e01..84f44cf035 100644 --- a/sched/sched_customize.cpp +++ b/sched/sched_customize.cpp @@ -37,10 +37,6 @@ // app_plan_uses_gpu(): // Which plan classes use GPUs // -// JOB::get_score(): -// Determine the value of sending a particular job to host; -// (used only by "matchmaker" scheduling) -// // WARNING: if you modify this file, you must prevent it from // being overwritten the next time you update BOINC source code. // You can either: diff --git a/sched/sched_main.cpp b/sched/sched_main.cpp index 9649fa11ca..2be5c65f2c 100644 --- a/sched/sched_main.cpp +++ b/sched/sched_main.cpp @@ -557,7 +557,7 @@ int main(int argc, char** argv) { #endif if (!fout) { log_messages.printf(MSG_CRITICAL, - "can't write client file\n" + "can't write client log file %s\n", log_path ); exit(1); } diff --git a/sched/sched_score.cpp b/sched/sched_score.cpp index 6be1de78f0..0eccc71f59 100644 --- a/sched/sched_score.cpp +++ b/sched/sched_score.cpp @@ -174,8 +174,7 @@ void send_work_score_type(int rt) { clear_others(rt); - int nscan = config.mm_max_slots; - if (!nscan) nscan = ssp->max_wu_results; + int nscan = ssp->max_wu_results; int rnd_off = rand() % ssp->max_wu_results; if (config.debug_send_scan) { log_messages.printf(MSG_NORMAL, diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 0c9b14d463..63fd5bc88b 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -1240,7 +1240,7 @@ static void send_user_messages() { // If work was sent from apps the user did not select, explain. // NOTE: this will have to be done differently with matchmaker scheduling // - if (!config.locality_scheduling && !config.locality_scheduler_fraction && !config.matchmaker) { + if (!config.locality_scheduling && !config.locality_scheduler_fraction && config.sched_old) { if (g_wreq->njobs_sent && !g_wreq->user_apps_only) { g_reply->insert_message( "No tasks are available for the applications you have selected", @@ -1479,8 +1479,8 @@ void send_work_setup() { } if (config.debug_send) { log_messages.printf(MSG_NORMAL, - "[send] %s matchmaker scheduling; %s EDF sim\n", - config.matchmaker?"Using":"Not using", + "[send] %s old scheduling; %s EDF sim\n", + config.sched_old?"Using":"Not using", config.workload_sim?"Using":"Not using" ); log_messages.printf(MSG_NORMAL, @@ -1727,10 +1727,10 @@ void send_work() { } } else if (config.locality_scheduling) { send_work_locality(); - } else if (config.matchmaker) { - send_work_score(); - } else { + } else if (config.sched_old) { send_work_old(); + } else { + send_work_score(); } done: