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

- client: more tweaks to work-fetch messages 

svn path=/trunk/boinc/; revision=25265
This commit is contained in:
David Anderson 2012-02-15 06:59:35 +00:00
parent bcc3ad6add
commit 68ac56c716
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -1715,3 +1715,9 @@ David 14 Feb 2012
client/ client/
work_fetch.cpp work_fetch.cpp
David 14 Feb 2012
- client: more tweaks to work-fetch messages
client/
work_fetch.cpp

34
client/work_fetch.cpp
View File

@ -408,7 +408,6 @@ void RSC_WORK_FETCH::print_state(const char* name) {
busy_time_estimator.get_busy_time() busy_time_estimator.get_busy_time()
); );
for (unsigned int i=0; i<gstate.projects.size(); i++) { for (unsigned int i=0; i<gstate.projects.size(); i++) {
char buf[256];
PROJECT* p = gstate.projects[i]; PROJECT* p = gstate.projects[i];
if (p->non_cpu_intensive) continue; if (p->non_cpu_intensive) continue;
RSC_PROJECT_WORK_FETCH& pwf = project_state(p); RSC_PROJECT_WORK_FETCH& pwf = project_state(p);
@ -417,16 +416,10 @@ void RSC_WORK_FETCH::print_state(const char* name) {
bool no_rsc_apps = p->no_rsc_apps[rsc_type]; bool no_rsc_apps = p->no_rsc_apps[rsc_type];
bool no_rsc_ams = p->no_rsc_ams[rsc_type]; bool no_rsc_ams = p->no_rsc_ams[rsc_type];
double bt = pwf.backoff_time>gstate.now?pwf.backoff_time-gstate.now:0; double bt = pwf.backoff_time>gstate.now?pwf.backoff_time-gstate.now:0;
sprintf(buf, " (project backoff %.2f)", p->min_rpc_time - gstate.now);
msg_printf(p, MSG_INFO, msg_printf(p, MSG_INFO,
"[work_fetch] %s: fetch share %.2f rec %.5f prio %.5f rsc backoff (dt %.2f, inc %.2f)%s%s%s%s%s%s%s%s%s", "[work_fetch] %s: fetch share %.2f rsc backoff (dt %.2f, inc %.2f)%s%s%s%s",
name, name,
pwf.fetchable_share, p->pwf.rec, p->sched_priority, bt, pwf.backoff_interval, pwf.fetchable_share, bt, pwf.backoff_interval,
p->suspended_via_gui?" (susp via GUI)":"",
p->master_url_fetch_pending?" (master fetch pending)":"",
p->min_rpc_time > gstate.now?buf:"",
p->dont_request_more_work?" (no new tasks)":"",
p->too_many_uploading_results?" (too many uploads)":"",
no_rsc_pref?" (blocked by prefs)":"", no_rsc_pref?" (blocked by prefs)":"",
no_rsc_apps?" (no apps)":"", no_rsc_apps?" (no apps)":"",
no_rsc_ams?" (blocked by account manager)":"", no_rsc_ams?" (blocked by account manager)":"",
@ -526,13 +519,28 @@ void WORK_FETCH::print_state() {
msg_printf(0, MSG_INFO, "[work_fetch] target work buffer: %.2f + %.2f sec", msg_printf(0, MSG_INFO, "[work_fetch] target work buffer: %.2f + %.2f sec",
gstate.work_buf_min(), gstate.work_buf_additional() gstate.work_buf_min(), gstate.work_buf_additional()
); );
for (int i=0; i<coprocs.n_rsc; i++) {
rsc_work_fetch[i].print_state(rsc_name(i));
}
for (unsigned int i=0; i<gstate.projects.size(); i++) { for (unsigned int i=0; i<gstate.projects.size(); i++) {
char buf[256];
PROJECT* p = gstate.projects[i]; PROJECT* p = gstate.projects[i];
if (p->non_cpu_intensive) continue; if (p->non_cpu_intensive) continue;
msg_printf(p, MSG_INFO, "[work_fetch] REC %f", p->pwf.rec); if (p->min_rpc_time > gstate.now) {
sprintf(buf, " (project backoff %.2f)", p->min_rpc_time - gstate.now);
} else {
strcpy(buf, "");
}
msg_printf(p, MSG_INFO, "[work_fetch] REC %f priority %f%s%s%s%s%s%s",
p->pwf.rec,
p->sched_priority,
buf,
p->suspended_via_gui?" (susp via GUI)":"",
p->master_url_fetch_pending?" (master fetch pending)":"",
p->min_rpc_time > gstate.now?buf:"",
p->dont_request_more_work?" (no new tasks)":"",
p->too_many_uploading_results?" (too many uploads)":""
);
}
for (int i=0; i<coprocs.n_rsc; i++) {
rsc_work_fetch[i].print_state(rsc_name(i));
} }
msg_printf(0, MSG_INFO, "[work_fetch] ------- end work fetch state -------"); msg_printf(0, MSG_INFO, "[work_fetch] ------- end work fetch state -------");
} }