diff --git a/checkin_notes b/checkin_notes index 53514c151e..6588d74c58 100644 --- a/checkin_notes +++ b/checkin_notes @@ -10044,3 +10044,11 @@ Charlie 11 Dec 2008 clientgui/ CompletionPage.cpp + +David 12 Dec 2008 + - scheduler: add option; + use this temporarily when you've fixed FLOPS estimate + + sched/ + sched_config.cpp,h + sched_send.cpp diff --git a/sched/sched_config.cpp b/sched/sched_config.cpp index f0d4d3f1ee..36a92d261d 100644 --- a/sched/sched_config.cpp +++ b/sched/sched_config.cpp @@ -185,6 +185,7 @@ int SCHED_CONFIG::parse(FILE* f) { if (xp.parse_bool(tag, "multiple_clients_per_host", multiple_clients_per_host)) continue; if (xp.parse_bool(tag, "no_vista_sandbox", no_vista_sandbox)) continue; if (xp.parse_bool(tag, "have_cuda_apps", have_cuda_apps)) continue; + if (xp.parse_bool(tag, "ignore_dcf", ignore_dcf)) continue; if (xp.parse_bool(tag, "debug_version_select", debug_version_select)) continue; diff --git a/sched/sched_config.h b/sched/sched_config.h index d43ba175d2..e2c36d5871 100644 --- a/sched/sched_config.h +++ b/sched/sched_config.h @@ -126,6 +126,7 @@ public: bool multiple_clients_per_host; bool no_vista_sandbox; bool have_cuda_apps; + bool ignore_dcf; // log flags // diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 09b90deebb..28fbc15010 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -356,7 +356,7 @@ static double estimate_wallclock_duration( ) { double ecd = estimate_cpu_duration(wu, reply); double ewd = ecd/reply.wreq.running_frac; - if (reply.host.duration_correction_factor) { + if (!config.ignore_dcf && reply.host.duration_correction_factor) { ewd *= reply.host.duration_correction_factor; } if (config.debug_send) {