- client: fix small bug that could interfere with work fetch

on hosts with both NVIDIA and ATI GPU

svn path=/trunk/boinc/; revision=20283
This commit is contained in:
David Anderson 2010-01-27 19:06:40 +00:00
parent 1effb5364e
commit d1a3243f57
2 changed files with 16 additions and 7 deletions

View File

@ -734,3 +734,10 @@ Charlie 27 Jan 2010
clientgui/ clientgui/
mac/ mac/
MacAccessiblity.cpp MacAccessiblity.cpp
David 27 Jan 2010
- client: fix small bug that could interfere with work fetch
on hosts with both NVIDIA and ATI GPU
client/
work_fetch.cpp

View File

@ -308,12 +308,6 @@ PROJECT* RSC_WORK_FETCH::choose_project(int criterion) {
} }
if (!pbest) return NULL; if (!pbest) return NULL;
if (log_flags.work_fetch_debug) {
msg_printf(pbest, MSG_INFO,
"chosen: %s %s", criterion_name(criterion), rsc_name(rsc_type)
);
}
// decide how much work to request from each resource // decide how much work to request from each resource
// //
work_fetch.clear_request(); work_fetch.clear_request();
@ -343,6 +337,14 @@ PROJECT* RSC_WORK_FETCH::choose_project(int criterion) {
return 0; return 0;
} }
if (log_flags.work_fetch_debug) {
msg_printf(pbest, MSG_INFO,
"chosen: %s %s: %.2f inst, %.2f sec",
criterion_name(criterion), rsc_name(rsc_type),
req_instances, req_secs
);
}
return pbest; return pbest;
} }
@ -816,7 +818,7 @@ PROJECT* WORK_FETCH::choose_project() {
if (cuda_usable) { if (cuda_usable) {
p = cuda_work_fetch.choose_project(FETCH_IF_IDLE_INSTANCE); p = cuda_work_fetch.choose_project(FETCH_IF_IDLE_INSTANCE);
} }
if (ati_usable) { if (!p && ati_usable) {
p = ati_work_fetch.choose_project(FETCH_IF_IDLE_INSTANCE); p = ati_work_fetch.choose_project(FETCH_IF_IDLE_INSTANCE);
} }
if (!p) { if (!p) {