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

client: mostly revert dddf586, which could lead to way overcommitted CPU

This commit is contained in:
David Anderson 2013-07-03 00:56:01 -07:00
parent 21b1af954e
commit 39af029598
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/cpu_sched.cpp
View File

@ -1591,6 +1591,7 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
// and prune those that can't be assigned // and prune those that can't be assigned
// //
assign_coprocs(run_list); assign_coprocs(run_list);
bool scheduled_mt = false;
// prune jobs that don't fit in RAM or that exceed CPU usage limits. // prune jobs that don't fit in RAM or that exceed CPU usage limits.
// Mark the rest as SCHEDULED // Mark the rest as SCHEDULED
@ -1637,6 +1638,22 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
} }
} }
// Don't overcommit CPUs by > 1 if a MT job is scheduled.
// Skip this check for GPU jobs.
//
if (!rp->uses_coprocs()
&& (scheduled_mt || (rp->avp->avg_ncpus > 1))
&& (ncpus_used + rp->avp->avg_ncpus > ncpus + 1)
) {
if (log_flags.cpu_sched_debug) {
msg_printf(rp->project, MSG_INFO,
"[cpu_sched_debug] avoid MT overcommit: skipping %s",
rp->name
);
}
continue;
}
double wss = 0; double wss = 0;
if (atp) { if (atp) {
atp->too_large = false; atp->too_large = false;
@ -1669,6 +1686,9 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
atp = get_task(rp); atp = get_task(rp);
} }
if (rp->avp->avg_ncpus > 1) {
scheduled_mt = true;
}
ncpus_used += rp->avp->avg_ncpus; ncpus_used += rp->avp->avg_ncpus;
atp->next_scheduler_state = CPU_SCHED_SCHEDULED; atp->next_scheduler_state = CPU_SCHED_SCHEDULED;
ram_left -= wss; ram_left -= wss;