From c481086bc057e8bdf90b5a1a5bb677882d2937c3 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 4 Mar 2009 21:02:18 +0000
Subject: [PATCH] - client: show duration estimates for CPU and CUDA separately
 - web: reverse Reply and Delete buttons in private msg page     fixes #858

svn path=/trunk/boinc/; revision=17500
---
 checkin_notes           | 12 +++++++++++-
 client/cs_scheduler.cpp | 19 +++++++++++++++----
 html/user/pm.php        |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 31c88c7718..8190577011 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2592,8 +2592,18 @@ David  3 Mar 2009
     client/
         client_state.cpp
 
-David  3 Mar 2009
+David  4 Mar 2009
     - client: run CPU benchmarks and contact ref site if platform changes
 
     client/
         client_state.cpp
+
+David  4 Mar 2009
+    - client: show duration estimates for CPU and CUDA separately
+    - web: reverse Reply and Delete buttons in private msg page
+        fixes #858
+
+    client/
+        cs_scheduler.cpp
+    html/user/
+        pm.php
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index 44252b0f43..5184dd49e4 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -761,7 +761,8 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
         wup->clear_errors();
         workunits.push_back(wup);
     }
-    double est_duration = 0;
+    double est_cpu_duration = 0;
+    double est_cuda_duration = 0;
     for (i=0; i<sr.results.size(); i++) {
         if (lookup_result(project, sr.results[i].name)) {
             msg_printf(project, MSG_INTERNAL_ERROR,
@@ -798,14 +799,24 @@ int CLIENT_STATE::handle_scheduler_reply(PROJECT* project, char* scheduler_url)
         results.push_back(rp);
         new_results.push_back(rp);
         rp->set_state(RESULT_NEW, "handle_scheduler_reply");
-        est_duration += rp->estimated_duration(false);
+        if (rp->avp->ncudas) {
+            est_cuda_duration += rp->estimated_duration(false);
+        } else {
+            est_cpu_duration += rp->estimated_duration(false);
+        }
     }
     if (log_flags.sched_op_debug) {
         if (sr.results.size()) {
             msg_printf(project, MSG_INFO,
-                "[sched_op_debug] estimated total job duration: %.0f seconds",
-                est_duration
+                "[sched_op_debug] estimated total CPU job duration: %.0f seconds",
+                est_cpu_duration
             );
+            if (coproc_cuda) {
+                msg_printf(project, MSG_INFO,
+                    "[sched_op_debug] estimated total CUDA job duration: %.0f seconds",
+                    est_cuda_duration
+                );
+            }
         }
     }
 
diff --git a/html/user/pm.php b/html/user/pm.php
index b658d11e27..dd02e01c86 100644
--- a/html/user/pm.php
+++ b/html/user/pm.php
@@ -99,8 +99,8 @@ function do_inbox($logged_in_user) {
             echo "<td valign=top>".output_transform($msg->content, $options)."<p>";
             $tokens = url_tokens($logged_in_user->authenticator);
 	    echo "<ul class=\"actionlist\">";
-            show_actionlist_button("pm.php?action=delete&amp;id=$msg->id&amp;$tokens", tra("Delete"), "Delete this message");
             show_actionlist_button("pm.php?action=new&amp;replyto=$msg->id", tra("Reply"), "Reply to this message");
+            show_actionlist_button("pm.php?action=delete&amp;id=$msg->id&amp;$tokens", tra("Delete"), "Delete this message");
             echo "</ul></td></tr>\n";
         }
         echo "