From 604a83aa968158b16ee38dd6ffcb9a5f4d88f3e1 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 29 Jan 2009 20:07:48 +0000
Subject: [PATCH] - client: if user requests RPC, do it even if project is
 backed off - manager: show backoff interval correctly

svn path=/trunk/boinc/; revision=17070
---
 checkin_notes                   | 10 ++++++++++
 client/cs_scheduler.cpp         |  3 +--
 client/work_fetch.cpp           |  4 ++--
 clientgui/DlgItemProperties.cpp |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 47819e10e3..03ad4b9215 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -893,3 +893,13 @@ David  29 Jan 2009
         user/
             hosts_user.php
             show_coproc.php
+
+David  29 Jan 2009
+	- client: if user requests RPC, do it even if project is backed off
+	- manager: show backoff interval correctly
+
+	client/
+		cs_scheduler.cpp
+		work_fetch.cpp
+	clientgui/
+		DlgItemProperties.cpp
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index 6add35ef68..4b767071cb 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -979,10 +979,9 @@ PROJECT* CLIENT_STATE::next_project_sched_rpc_pending() {
         if (p->next_rpc_time && p->next_rpc_time<now) {
             p->sched_rpc_pending = RPC_REASON_PROJECT_REQ;
             p->next_rpc_time = 0;
-        } else {
-            if (p->waiting_until_min_rpc_time()) continue;
         }
         // if (p->suspended_via_gui) continue;
+
         // do the RPC even if suspended.
         // This is critical for acct mgrs, to propagate new host CPIDs
         //
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 5fcbb3d320..202e09f0ed 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -405,7 +405,7 @@ void RSC_WORK_FETCH::update_debts() {
     //
     double offset = delta_sum/neligible;
     if (log_flags.debt_debug) {
-        msg_printf(p, MSG_INFO, "[debt] subtract %f for zero total change", offset);
+        msg_printf(0, MSG_INFO, "[debt] subtract %f for zero total change", offset);
 	}
     double max_debt = 0;
     for (i=0; i<gstate.projects.size(); i++) {
@@ -421,7 +421,7 @@ void RSC_WORK_FETCH::update_debts() {
     // This ensures that new projects start out debt-free.
     //
     if (log_flags.debt_debug) {
-        msg_printf(p, MSG_INFO, "[debt] subtract %f for zero max debt", max_debt);
+        msg_printf(0, MSG_INFO, "[debt] subtract %f for zero max debt", max_debt);
 	}
     for (i=0; i<gstate.projects.size(); i++) {
         p = gstate.projects[i];
diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp
index dd663ce3b1..0607cfadf9 100755
--- a/clientgui/DlgItemProperties.cpp
+++ b/clientgui/DlgItemProperties.cpp
@@ -108,7 +108,7 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
 	addProperty(_("Team name"),wxString(project->team_name.c_str(),wxConvUTF8));
 	addProperty(_("Resource share"),wxString::Format(wxT("%0.0f"),project->resource_share));
     if (project->min_rpc_time > dtime()) {
-		addProperty(_("Scheduler RPC deferred for"), FormatTime(dtime() - project->min_rpc_time));
+		addProperty(_("Scheduler RPC deferred for"), FormatTime(project->min_rpc_time - dtime()));
     }
 	addProperty(_("Disk usage"),FormatDiskSpace(diskusage));
 	addProperty(_("Non CPU intensive"),project->non_cpu_intensive ? _("yes") : _("no"));