From 7e41a84c16d5142a26a29aea149803a82eb36492 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 17 Oct 2011 17:02:05 +0000
Subject: [PATCH] - add boinc_opencl.h to set of installed headers - emulator
 tweaks

svn path=/trunk/boinc/; revision=24407
---
 api/Makefile.am     |  1 +
 checkin_notes       |  9 +++++++++
 client/sim.cpp      | 14 +++++++++-----
 client/sim_util.cpp |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/api/Makefile.am b/api/Makefile.am
index 96c0731fb9..042e55080c 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -47,6 +47,7 @@ if INSTALL_HEADERS
 ## install only headers that are meant for exporting the API !!
 pkginclude_HEADERS = 	\
 	boinc_api.h   	\
+	boinc_opencl.h   	\
 	graphics2.h	\
 	gutil.h
 endif ## INSTALL_HEADERS
diff --git a/checkin_notes b/checkin_notes
index 1bdc59c34f..4ed52be3a8 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7327,3 +7327,12 @@ David  16 Oct 2011
             util.inc
     client/
         sim.cpp
+
+David  17 Oct 2011
+    - add boinc_opencl.h to set of installed headers
+    - emulator tweaks
+    lib/
+        Makefile.am
+    client/
+        sim.cpp
+        sim_util.cpp
diff --git a/client/sim.cpp b/client/sim.cpp
index 09cc49bdfe..10319698d2 100644
--- a/client/sim.cpp
+++ b/client/sim.cpp
@@ -837,10 +837,8 @@ void show_resource(int rsc_type) {
         if (rsc_type) {
             if (rp->avp->gpu_usage.rsc_type != rsc_type) continue;
             ninst = rp->avp->gpu_usage.usage;
-            sprintf(buf, " GPU %d", rp->coproc_indices[0]);
         } else {
             ninst = rp->avp->avg_ncpus;
-            strcpy(buf, "");
         }
 
         PROJECT* p = rp->project;
@@ -848,10 +846,16 @@ void show_resource(int rsc_type) {
             found = true;
             fprintf(html_out,
                 "<table>\n"
-                "<tr><th>#devs</th><th>Job name</th><th>FLOPS left</th></tr>\n"
+                "<tr><th>#devs</th><th>Job name</th><th>GFLOPs left</th>%s</tr>\n",
+                rsc_type?"<th>GPU</th>":""
             );
         }
-        fprintf(html_out, "<tr><td>%.2f</td><td bgcolor=%s><font color=#ffffff>%s%s</font></td><td>%.0fG%s</td></tr>\n",
+        if (rsc_type) {
+            sprintf(buf, "<td>%d</td>", rp->coproc_indices[0]);
+        } else {
+            strcpy(buf, "");
+        }
+        fprintf(html_out, "<tr><td>%.2f</td><td bgcolor=%s><font color=#ffffff>%s%s</font></td><td>%.0f</td>%s</tr>\n",
             ninst,
             colors[p->index%NCOLORS],
             atp->result->rr_sim_misses_deadline?"*":"",
@@ -906,7 +910,7 @@ void html_start() {
         "<table border=0 cellpadding=4><tr><th width=%d>Time</th>\n", WIDTH1
     );
     fprintf(html_out,
-        "<th width=%d>CPU<br>* means EDF mode</th>", WIDTH2
+        "<th width=%d>CPU</th>", WIDTH2
     );
     if (coprocs.have_nvidia()) {
         fprintf(html_out, "<th width=%d>NVIDIA GPU</th>", WIDTH2);
diff --git a/client/sim_util.cpp b/client/sim_util.cpp
index 79faa5baa0..ed81fbec52 100644
--- a/client/sim_util.cpp
+++ b/client/sim_util.cpp
@@ -104,7 +104,7 @@ int ACTIVE_TASK::resume_or_start(bool first_time) {
     }
     set_task_state(PROCESS_EXECUTING, "start");
     char buf[256];
-    sprintf(buf, "Starting %s: %.2fG<br>", result->name, flops_left/1e9);
+    sprintf(buf, "Starting %s<br>", result->name);
     html_msg += buf;
     return 0;
 }