From b3f07e1a0ce92dedb3096f18602dfdec59f02c14 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 1 Apr 2009 23:22:17 +0000 Subject: [PATCH] - client: show project name in "backoff ended" msg svn path=/trunk/boinc/; revision=17719 --- checkin_notes | 8 ++++++++ client/app.cpp | 4 ++-- client/cpu_sched.cpp | 4 +++- client/cs_scheduler.cpp | 4 +++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index 815bc5d7d3..a8afdf3df8 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3517,3 +3517,11 @@ Charlie 1 Apr 2009 mac_build/ boinc.xcodeproj/ project.pbxproj + +David 1 Apr 2009 + - client: show project name in "backoff ended" msg + + client/ + app.cpp + cpu_sched.cpp + cs_scheduler.cpp diff --git a/client/app.cpp b/client/app.cpp index d5d7edc400..556ed5deba 100644 --- a/client/app.cpp +++ b/client/app.cpp @@ -610,7 +610,7 @@ int ACTIVE_TASK::parse(MIOFILE& fin) { if (!project) { msg_printf( NULL, MSG_INTERNAL_ERROR, - "State file error: project %s not found\n", + "State file error: project %s not found for task\n", project_master_url ); return ERR_NULL; @@ -619,7 +619,7 @@ int ACTIVE_TASK::parse(MIOFILE& fin) { if (!result) { msg_printf( project, MSG_INTERNAL_ERROR, - "State file error: result %s not found\n", + "State file error: result %s not found for task\n", result_name ); return ERR_NULL; diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp index 4b6fea8999..0c1ac5fb96 100644 --- a/client/cpu_sched.cpp +++ b/client/cpu_sched.cpp @@ -64,7 +64,9 @@ using std::vector; #define DEADLINE_CUSHION 0 // try to finish jobs this much in advance of their deadline -bool COPROCS::sufficient_coprocs(COPROCS& needed, bool log_flag, const char* prefix) { +bool COPROCS::sufficient_coprocs( + COPROCS& needed, bool log_flag, const char* prefix +) { for (unsigned int i=0; itype); diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp index a3fec1c061..5a1ae897d4 100644 --- a/client/cs_scheduler.cpp +++ b/client/cs_scheduler.cpp @@ -967,7 +967,9 @@ void CLIENT_STATE::check_project_timeout() { PROJECT* p = projects[i]; if (p->possibly_backed_off && now > p->min_rpc_time) { p->possibly_backed_off = false; - request_work_fetch("Project backoff ended"); + char buf[256]; + sprintf(buf, "Backoff ended for %s", p->get_project_name()); + request_work_fetch(buf); } } }