Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=6382
This commit is contained in:
David Anderson 2005-06-19 07:54:14 +00:00
parent a97b849a11
commit d38d8059d3
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -8047,3 +8047,14 @@ David 18 June 2005
client/ client/
cs_scheduler.C cs_scheduler.C
time_stats.C time_stats.C
David 18 June 2005
- Refine the round-robin simulation added earlier today
to model multiple CPUs.
- Fix bug in update of duration_correction_factor
(both from John McLeod)
client/
client_types.C
cs_scheduler.C

4
client/client_types.C
View File

@ -437,9 +437,9 @@ void PROJECT::update_duration_correction_factor(RESULT* rp) {
duration_correction_factor = factor; duration_correction_factor = factor;
} else { } else {
if (factor < 0.1) { if (factor < 0.1) {
duration_correction_factor *= 0.99; duration_correction_factor = 0.99 * duration_correction_factor + 0.01 * factor;
} else { } else {
duration_correction_factor *= 0.9; duration_correction_factor = 0.9 * duration_correction_factor + 0.1 * factor;
} }
} }
} }

24
client/cs_scheduler.C
View File

@ -1008,17 +1008,16 @@ void CLIENT_STATE::set_scheduler_modes() {
std::map<double, RESULT*> results_by_deadline; std::map<double, RESULT*> results_by_deadline;
RESULT* rp; RESULT* rp;
unsigned int i, j; unsigned int i, j;
int k;
bool should_not_fetch_work = false; bool should_not_fetch_work = false;
bool use_earliest_deadline_first = false; bool use_earliest_deadline_first = false;
std::vector <double> booked_to;
#if 0 #if 0
double frac_booked = 0; double frac_booked = 0;
std::vector <double> booked_to;
std::map<double, RESULT*>::iterator it; std::map<double, RESULT*>::iterator it;
#endif #endif
double total_proc_rate = avg_proc_rate(); double total_proc_rate = avg_proc_rate();
#if 0
double per_cpu_proc_rate = total_proc_rate/ncpus; double per_cpu_proc_rate = total_proc_rate/ncpus;
#endif
SCOPE_MSG_LOG scope_messages(log_messages, CLIENT_MSG_LOG::DEBUG_SCHED_CPU); SCOPE_MSG_LOG scope_messages(log_messages, CLIENT_MSG_LOG::DEBUG_SCHED_CPU);
@ -1027,20 +1026,29 @@ void CLIENT_STATE::set_scheduler_modes() {
// //
bool round_robin_misses_deadline = false; bool round_robin_misses_deadline = false;
double rrs = runnable_resource_share(); double rrs = runnable_resource_share();
for (k=0; k<ncpus; k++) {
booked_to.push_back(now);
}
for (i=0; i<projects.size(); i++) { for (i=0; i<projects.size(); i++) {
PROJECT* p = projects[i]; PROJECT* p = projects[i];
if (!p->runnable()) continue; if (!p->runnable()) continue;
double proc_rate = total_proc_rate * (p->resource_share/rrs); double project_proc_rate = per_cpu_proc_rate * (p->resource_share/rrs);
double start_time = now;
for (j=0; j<results.size(); j++) { for (j=0; j<results.size(); j++) {
rp = results[j]; rp = results[j];
if (rp->project != p) continue; if (rp->project != p) continue;
if (!rp->runnable()) continue; if (!rp->runnable()) continue;
start_time += rp->estimated_cpu_time_remaining()/proc_rate; double first = booked_to[0];
int ifirst = 0;
for (k=1; k<ncpus; k++) {
if (first < booked_to[ifirst]) {
first = booked_to[ifirst];
}
}
booked_to[ifirst] += rp->estimated_cpu_time_remaining()/project_proc_rate;
scope_messages.printf("set_scheduler_modes() result %s: est %f, deadline %f\n", scope_messages.printf("set_scheduler_modes() result %s: est %f, deadline %f\n",
rp->name, start_time, rp->report_deadline rp->name, booked_to[ifirst], rp->report_deadline
); );
if (start_time > rp->report_deadline) { if (booked_to[ifirst] > rp->report_deadline) {
round_robin_misses_deadline = true; round_robin_misses_deadline = true;
break; break;
} }