From 61d9c06771098a12bd89e8455f1eb289c5ed98f8 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 14 May 2011 04:08:12 +0000
Subject: [PATCH] - client/manager: don't show resource usage for
 non-CPU-intensive jobs

svn path=/trunk/boinc/; revision=23549
---
 checkin_notes              | 8 ++++++++
 client/client_types.cpp    | 2 +-
 clientgui/MainDocument.cpp | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 991c31a9a0..6f472aacea 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2978,3 +2978,11 @@ David  13 May 2011
     sched/
         sched_send.cpp
         sched_limit.h
+
+David  13 May 2011
+    - client/manager: don't show resource usage for non-CPU-intensive jobs
+
+    client/
+        client_types.cpp
+    clientgui/
+        MainDocument.cpp
diff --git a/client/client_types.cpp b/client/client_types.cpp
index 2091e08ace..9ecce9d031 100644
--- a/client/client_types.cpp
+++ b/client/client_types.cpp
@@ -1955,7 +1955,7 @@ int RESULT::write_gui(MIOFILE& out) {
             sprintf(resources, "%.2f CPUs + %s GPU (missing)",
                 avp->avg_ncpus, avp->missing_coproc_name
             );
-        } else if (avp->avg_ncpus != 1) {
+        } else if (!project->non_cpu_intensive && (avp->avg_ncpus != 1)) {
             sprintf(resources, "%.2f CPUs", avp->avg_ncpus);
         } else {
             strcpy(resources, " ");
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 7bef6d7488..04d7e24874 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -2462,7 +2462,7 @@ wxString result_description(RESULT* result, bool show_resources) {
             } else if (result->scheduler_state == CPU_SCHED_UNINITIALIZED) {
                 strBuffer += _("Ready to start");
             }
-            if (strlen(result->resources) && show_resources) {
+            if (strlen(result->resources)>1 && show_resources) {
                 strBuffer += wxString(wxT(" (")) + wxString(result->resources, wxConvUTF8) + wxString(wxT(")"));
             }
         } else {