From f3ffbf67f497e1d779d88de480e78e59a557d0ae Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 18 Oct 2013 00:46:48 -0700
Subject: [PATCH] GUI RPC: add cpu_time (as well as elapsed_time) to OLD_RESULT

---
 client/result.cpp          | 3 +++
 client/result.h            | 1 +
 lib/gui_rpc_client.h       | 1 +
 lib/gui_rpc_client_ops.cpp | 1 +
 4 files changed, 6 insertions(+)

diff --git a/client/result.cpp b/client/result.cpp
index 77e269f95e..38f09353a6 100644
--- a/client/result.cpp
+++ b/client/result.cpp
@@ -613,6 +613,7 @@ void add_old_result(RESULT& r) {
     strcpy(ores.result_name, r.name);
     strcpy(ores.app_name, r.app->name);
     ores.elapsed_time = r.final_elapsed_time;
+    ores.cpu_time = r.final_cpu_time;
     ores.completed_time = r.completed_time;
     ores.create_time = gstate.now;
     ores.exit_status = r.exit_status;
@@ -631,6 +632,7 @@ void print_old_results(MIOFILE& mf) {
             "         <app_name>%s</app_name>\n"
             "         <exit_status>%d</exit_status>\n"
             "         <elapsed_time>%f</elapsed_time>\n"
+            "         <cpu_time>%f</cpu_time>\n"
             "         <completed_time>%f</completed_time>\n"
             "         <create_time>%f</create_time>\n"
             "    </old_result>\n",
@@ -639,6 +641,7 @@ void print_old_results(MIOFILE& mf) {
             ores.app_name,
             ores.exit_status,
             ores.elapsed_time,
+            ores.cpu_time,
             ores.completed_time,
             ores.create_time
         );
diff --git a/client/result.h b/client/result.h
index ebf17672f2..f4b851f775 100644
--- a/client/result.h
+++ b/client/result.h
@@ -204,6 +204,7 @@ struct OLD_RESULT {
     char app_name[256];
     int exit_status;
     double elapsed_time;
+    double cpu_time;
     double completed_time;
     double create_time;     // when this record was created
 };
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index f297e235f2..b937c3886b 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -641,6 +641,7 @@ struct OLD_RESULT {
     char app_name[256];
     int exit_status;
     double elapsed_time;
+    double cpu_time;
     double completed_time;
     double create_time;
 
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 1d57f5e7db..9dc65e031a 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -90,6 +90,7 @@ int OLD_RESULT::parse(XML_PARSER& xp) {
         if (xp.parse_str("app_name", app_name, sizeof(app_name))) continue;
         if (xp.parse_int("exit_status", exit_status)) continue;
         if (xp.parse_double("elapsed_time", elapsed_time)) continue;
+        if (xp.parse_double("cpu_time", cpu_time)) continue;
         if (xp.parse_double("completed_time", completed_time)) continue;
         if (xp.parse_double("create_time", create_time)) continue;
     }