From 15b5e6e6a7c1c2ba5f7aef1064c14564506225b6 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 3 Nov 2011 22:27:20 +0000
Subject: [PATCH] 	- client: show GPU exclusions at startup 	
 (need to do this after reading the state file, 		since GPU
 exclusions refer to projects). 	- client: fix bug that added garbage
 <coproc> element 		to <app_version> in state file when using GPU
 exclusions

svn path=/trunk/boinc/; revision=24522
---
 checkin_notes           | 12 ++++++++++++
 client/client_state.cpp |  8 ++++++--
 client/client_types.cpp |  2 +-
 client/log_flags.cpp    |  5 +----
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 3e0677035e..9b4835f656 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8061,3 +8061,15 @@ David  3 Nov 2011
 
     samples/wrapper/
         wrapper.cpp
+
+David  3 Nov 2011
+	- client: show GPU exclusions at startup
+		(need to do this after reading the state file,
+		since GPU exclusions refer to projects).
+	- client: fix bug that added garbage <coproc> element
+		to <app_version> in state file when using GPU exclusions
+
+	client/
+		client_types.cpp
+		client_state.cpp
+		log_flags.cpp
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 43e6355948..736b053b9e 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -323,7 +323,6 @@ int CLIENT_STATE::init() {
         );
     }
 
-    config.show();
     log_flags.show();
 
     msg_printf(NULL, MSG_INFO, "Libraries: %s", curl_version());
@@ -377,7 +376,7 @@ int CLIENT_STATE::init() {
                 msg_printf(NULL, MSG_INFO, "%s", warnings[i].c_str());
             }
         }
-#if 0
+#if 1
         msg_printf(NULL, MSG_INFO, "Faking an NVIDIA GPU");
         coprocs.nvidia.fake(18000, 512*MEGA, 490*MEGA, 1);
 #endif
@@ -433,6 +432,11 @@ int CLIENT_STATE::init() {
     //
     parse_state_file();
 
+    // this needs to go after parse_state_file because
+    // GPU exclusions refer to projects
+    //
+    config.show();
+
     // inform the user if there's a newer version of client
     //
     newer_version_startup_check();
diff --git a/client/client_types.cpp b/client/client_types.cpp
index e0e2e302c1..65463ad83a 100644
--- a/client/client_types.cpp
+++ b/client/client_types.cpp
@@ -1385,7 +1385,7 @@ int APP_VERSION::write(MIOFILE& out, bool write_file_info) {
             gpu_usage.usage
         );
     }
-    if (missing_coproc) {
+    if (missing_coproc && strlen(missing_coproc_name)) {
         out.printf(
             "    <coproc>\n"
             "        <type>%s</type>\n"
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index 36debe58b6..ad6bb89a91 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -502,10 +502,7 @@ void process_gpu_exclusions() {
         }
         if (found) continue;
         avp->missing_coproc = true;
-        msg_printf(avp->project, MSG_INFO,
-            "All GPUs excluded for %s %d (%s)",
-            avp->app->name, avp->version_num, avp->plan_class
-        );
+        strcpy(avp->missing_coproc_name, "");
         for (j=0; j<gstate.results.size(); j++) {
             RESULT* rp = gstate.results[j];
             if (rp->avp != avp) continue;