- client: fix messages

svn path=/trunk/boinc/; revision=16960
This commit is contained in:
David Anderson 2009-01-20 18:06:49 +00:00
parent 85a8e6a772
commit f33631cbbc
3 changed files with 17 additions and 17 deletions

View File

@ -499,3 +499,10 @@ David 19 Jan 2009
sched_config.cpp,h
sched_result.cpp
server_types.h
David 20 Jan 2009
- client: fix messages
client/
rr_sim.cpp
work_fetch.cpp

View File

@ -39,12 +39,12 @@ struct RR_SIM_STATUS {
inline bool can_run(RESULT* rp) {
return coprocs.sufficient_coprocs(
rp->avp->coprocs, log_flags.rr_simulation, "rr_sim"
rp->avp->coprocs, false, "rr_sim"
);
}
inline void activate(RESULT* rp, double when) {
coprocs.reserve_coprocs(
rp->avp->coprocs, rp, log_flags.rr_simulation, "rr_sim"
rp->avp->coprocs, rp, false, "rr_sim"
);
if (log_flags.rr_simulation) {
msg_printf(rp->project, MSG_INFO,
@ -59,7 +59,7 @@ struct RR_SIM_STATUS {
// and adjust CPU time left for other results
//
inline void remove_active(RESULT* rpbest) {
coprocs.free_coprocs(rpbest->avp->coprocs, rpbest, log_flags.rr_simulation, "rr_sim");
coprocs.free_coprocs(rpbest->avp->coprocs, rpbest, false, "rr_sim");
vector<RESULT*>::iterator it = active.begin();
while (it != active.end()) {
RESULT* rp = *it;
@ -216,7 +216,7 @@ void CLIENT_STATE::rr_simulation() {
if (log_flags.rr_simulation) {
msg_printf(0, MSG_INFO,
"[rr_sim] rr_sim start: now %f work_buf_total %f",
"[rr_sim] rr_sim start: now %.2f work_buf_total %.2f",
now, work_buf_total()
);
}
@ -299,7 +299,7 @@ void CLIENT_STATE::rr_simulation() {
if (atp && atp->procinfo.working_set_size_smoothed > ar) {
if (log_flags.rr_simulation) {
msg_printf(pbest, MSG_INFO,
"[rr_sim] result %s misses deadline but too large to run",
"[rr_sim] %s misses deadline but too large to run",
rpbest->name
);
}
@ -308,7 +308,7 @@ void CLIENT_STATE::rr_simulation() {
pbest->rr_sim_status.deadlines_missed++;
if (log_flags.rr_simulation) {
msg_printf(pbest, MSG_INFO,
"[rr_sim] result %s misses deadline by %f",
"[rr_sim] %s misses deadline by %.2f",
rpbest->name, diff
);
}
@ -350,15 +350,6 @@ void CLIENT_STATE::rr_simulation() {
break;
}
}
// If all work done for a project, subtract that project's share
//
if (pbest->rr_sim_status.none_active()) {
if (pbest->rr_sim_status.has_cpu_jobs) {
cpu_work_fetch.total_runnable_share -= pbest->resource_share;
}
}
sim_now += rpbest->rrsim_finish_delay;
}

View File

@ -145,18 +145,19 @@ void WORK_FETCH::set_overall_debts() {
void RSC_WORK_FETCH::print_state(char* name) {
msg_printf(0, MSG_INFO,
"[wfd] %s: shortfall %.2f nidle %.2f total RS %.2f runnable RS %.2f",
"[wfd] %s: shortfall %.2f nidle %.2f fetchable RS %.2f runnable RS %.2f",
name,
shortfall, nidle_now,
total_fetchable_share, total_runnable_share
);
for (unsigned int i=0; i<gstate.projects.size(); i++) {
PROJECT* p = gstate.projects[i];
if (p->non_cpu_intensive) continue;
RSC_PROJECT_WORK_FETCH& pwf = project_state(p);
msg_printf(p, MSG_INFO,
"[wfd] %s: runshare %.2f debt %.2f backoff t %.2f int %.2f",
name,
pwf.runnable_share, pwf.debt, pwf.backoff_time-gstate.now, pwf.backoff_interval
pwf.runnable_share, pwf.debt, pwf.backoff_time, pwf.backoff_interval
);
}
}
@ -169,6 +170,7 @@ void WORK_FETCH::print_state() {
}
for (unsigned int i=0; i<gstate.projects.size(); i++) {
PROJECT* p = gstate.projects[i];
if (p->non_cpu_intensive) continue;
msg_printf(p, MSG_INFO, "[wfd] overall_debt %f", p->pwf.overall_debt);
}
msg_printf(0, MSG_INFO, "[wfd] ------- end work fetch state -------");