From e3b9e4d9e00bbedbf1229449612149776320c5e5 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 5 Jul 2005 19:09:42 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=6525 --- checkin_notes | 10 ++++++++++ sched/sched_send.C | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 4cd8afadd8..8fbe23727a 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8892,3 +8892,13 @@ David 5 July 2005 api/ boinc_api.C graphics_impl.C + +David 5 July 2005 + - scheduler: in estimating result duration, + don't divide by resource share fraction. + This assumes round-robin across all projects, + which is no longer necessarily the case. + (From John McLeod) + + sched/ + sched_send.C diff --git a/sched/sched_send.C b/sched/sched_send.C index a1563a4ac3..2215452d4c 100644 --- a/sched/sched_send.C +++ b/sched/sched_send.C @@ -163,7 +163,10 @@ static double estimate_cpu_duration(WORKUNIT& wu, SCHEDULER_REPLY& reply) { } // estimate the amount of real time to complete this WU, -// taking into account active_frac and resource_share_fraction +// taking into account active_frac etc. +// Note: don't factor in resource_share_fraction. +// The core client no longer necessarily does round-robin +// across all projects. // static double estimate_wallclock_duration( WORKUNIT& wu, SCHEDULER_REQUEST& request, SCHEDULER_REPLY& reply @@ -179,7 +182,7 @@ static double estimate_wallclock_duration( } if (running_frac > 1) running_frac = 1; double ecd = estimate_cpu_duration(wu, reply); - double ewd = ecd/(running_frac*request.resource_share_fraction); + double ewd = ecd/running_frac; if (reply.host.duration_correction_factor) { ewd *= reply.host.duration_correction_factor; }