From bcc3ad6add497b3eedf4d30781a426cd6372551b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 15 Feb 2012 05:49:12 +0000 Subject: [PATCH] - client: instead of saying "comm deferred", say "project backoff XXX.XX". svn path=/trunk/boinc/; revision=25264 --- checkin_notes | 7 +++++++ client/work_fetch.cpp | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 7833361bcc..7ffc3d42eb 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1708,3 +1708,10 @@ David 14 Feb 2012 vda/ vdad.cpp vda_lib.h + +David 14 Feb 2012 + - client: instead of saying "comm deferred", + say "project backoff XXX.XX". + + client/ + work_fetch.cpp diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp index 7f472c6f22..7fbd3a8676 100644 --- a/client/work_fetch.cpp +++ b/client/work_fetch.cpp @@ -408,6 +408,7 @@ void RSC_WORK_FETCH::print_state(const char* name) { busy_time_estimator.get_busy_time() ); for (unsigned int i=0; inon_cpu_intensive) continue; RSC_PROJECT_WORK_FETCH& pwf = project_state(p); @@ -416,13 +417,14 @@ void RSC_WORK_FETCH::print_state(const char* name) { bool no_rsc_apps = p->no_rsc_apps[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; + sprintf(buf, " (project backoff %.2f)", p->min_rpc_time - gstate.now); msg_printf(p, MSG_INFO, - "[work_fetch] %s: fetch share %.2f rec %.5f prio %.5f backoff dt %.2f int %.2f%s%s%s%s%s%s%s%s%s", + "[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", name, pwf.fetchable_share, p->pwf.rec, p->sched_priority, 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?" (comm deferred)":"", + 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)":"",