From 6511e1f8e8fab40b109113ab04f76284bae5ab8a Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 16 Jun 2010 21:57:28 +0000
Subject: [PATCH] - client: let fake CUDA specify driver version - client:
 restore call to diagnostics_finish() on exit. 	(should print mem info, but
 doesn't) - manager: notices display tweak

svn path=/trunk/boinc/; revision=21759
---
 checkin_notes             | 15 +++++++++++++++
 client/client_state.cpp   |  2 +-
 client/coproc_detect.cpp  |  4 ++--
 client/main.cpp           |  1 +
 clientgui/ViewNotices.cpp |  8 ++++----
 lib/coproc.h              |  2 +-
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 113ea76873..df04522e8d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4297,3 +4297,18 @@ Charlie  15 Jun 2010
 
     lib/
         procinfo_mac.cpp
+
+David  16 Jun 2010
+	- client: let fake CUDA specify driver version
+	- client: restore call to diagnostics_finish() on exit.
+		(should print mem info, but doesn't)
+	- manager: notices display tweak 
+
+	client/
+		client_state.cpp
+		coproc_detect.cpp
+		main.cpp
+	clientgui/
+		ViewNotices.cpp
+	lib/
+		coproc.h
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 42896614c9..6ec0c4f07c 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -274,7 +274,7 @@ int CLIENT_STATE::init() {
         }
 #if 0
         msg_printf(NULL, MSG_INFO, "Faking an NVIDIA GPU");
-        host_info.coprocs.cuda.fake(256*MEGA, 2);
+        host_info.coprocs.cuda.fake(18000, 256*MEGA, 2);
         host_info.coprocs.cuda.available_ram_fake[0] = 256*MEGA;
         host_info.coprocs.cuda.available_ram_fake[1] = 192*MEGA;
 #endif
diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp
index 9bc22774b9..70a08b0c1d 100644
--- a/client/coproc_detect.cpp
+++ b/client/coproc_detect.cpp
@@ -427,13 +427,13 @@ void COPROC_CUDA::get(
 
 // fake a NVIDIA GPU (for debugging)
 //
-void COPROC_CUDA::fake(double ram, int n) {
+void COPROC_CUDA::fake(int driver_version, double ram, int n) {
    strcpy(type, "CUDA");
    count = n;
    for (int i=0; i<count; i++) {
        device_nums[i] = i;
    }
-   display_driver_version = 18000;
+   display_driver_version = driver_version;
    cuda_version = 2020;
    strcpy(prop.name, "Fake NVIDIA GPU");
    prop.totalGlobalMem = (unsigned int)ram;
diff --git a/client/main.cpp b/client/main.cpp
index 6e46868b15..02ceff817c 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -342,6 +342,7 @@ static int finalize() {
 
     gstate.free_mem();
 
+    diagnostics_finish();
     gstate.cleanup_completed = true;
     return 0;
 }
diff --git a/clientgui/ViewNotices.cpp b/clientgui/ViewNotices.cpp
index a3951eb013..bd2e9b4505 100644
--- a/clientgui/ViewNotices.cpp
+++ b/clientgui/ViewNotices.cpp
@@ -172,16 +172,16 @@ void CViewNotices::OnListRender(wxTimerEvent& WXUNUSED(event)) {
                 sprintf(tbuf, "<b>%s</b>", np->title);
 
             }
-            if (strlen(np->project_name)) {
-                sprintf(buf, " from %s", np->project_name);
-                strcat(tbuf, buf);
-            }
             if (strlen(tbuf)) {
                 strcat(tbuf, "<br>");
                 strItems += wxString(tbuf, wxConvUTF8);
             }
             strItems += process_client_message(np->description.c_str());
             strItems += wxT("<br><font size=-2 color=#8f8f8f>");
+            if (strlen(np->project_name)) {
+                sprintf(buf, "From %s<br>", np->project_name);
+                strItems += wxString(buf, wxConvUTF8);
+            }
             dtBuffer.Set((time_t)np->arrival_time);
             strItems += dtBuffer.Format();
             if (strlen(np->link)) {
diff --git a/lib/coproc.h b/lib/coproc.h
index 332698c929..fd86406bf2 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -222,7 +222,7 @@ struct COPROC_CUDA : public COPROC {
     void get_available_ram();
 
     bool check_running_graphics_app();
-    void fake(double, int);
+    void fake(int driver_version, double ram, int count);
 
 };