From 87d50be3021e2ce3c874e7e824e0a706d090eb89 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 10 Apr 2009 19:18:44 +0000
Subject: [PATCH] - GUI RPC and manager: send slot and show it in task
 properties     rather than slot path     (slot_path is defined only for apps
 with graphics app).

svn path=/trunk/boinc/; revision=17786
---
 checkin_notes                   | 11 +++++++++++
 clientgui/DlgItemProperties.cpp |  4 +++-
 lib/gui_rpc_client.h            |  2 ++
 lib/gui_rpc_client_ops.cpp      |  2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index 4f3d126487..8ccf4cde65 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3808,3 +3808,14 @@ David  10 Apr 2009
     lib/
         gui_rpc_client.h
         gui_rpc_client_ops.cpp
+
+David  10 Apr 2009
+    - GUI RPC and manager: send slot and show it in task properties
+        rather than slot path
+        (slot_path is defined only for apps with graphics app).
+
+    clientgui/
+        DlgItemProperties.cpp
+    lib/
+        gui_rpc_client.h
+        gui_rpc_client_ops.cpp
diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp
index 5a6ff94ae9..7c43ba0217 100755
--- a/clientgui/DlgItemProperties.cpp
+++ b/clientgui/DlgItemProperties.cpp
@@ -181,7 +181,9 @@ void CDlgItemProperties::renderInfos(RESULT* result) {
 		addProperty(_("Fraction done"), wxString::Format(wxT("%.3f %%"), result->fraction_done*100));
 		addProperty(_("Virtual memory size"), FormatDiskSpace(result->swap_size));
 		addProperty(_("Working set size"), FormatDiskSpace(result->working_set_size_smoothed));
-        addProperty(_("Execution directory"), result->slot_path);
+        if (result->slot >= 0) {
+            addProperty(_("Slot"), result->slot);
+        }
 	} else if (result->state >= RESULT_COMPUTE_ERROR) {
 		addProperty(_("CPU time"), FormatTime(result->final_cpu_time));
 		addProperty(_("Elapsed time"), FormatTime(result->final_elapsed_time));
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 34d6245dca..a785b347bc 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -221,6 +221,7 @@ public:
     bool active_task;
     int active_task_state;
     int app_version_num;
+    int slot;
     double checkpoint_cpu_time;
     double current_cpu_time;
     double fraction_done;
@@ -236,6 +237,7 @@ public:
     bool edf_scheduled;
     std::string graphics_exec_path;
     std::string slot_path;
+        // only present if graphics_exec_path is
     std::string resources;
 
     APP* app;
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 2739e15283..8b942d4361 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -405,6 +405,7 @@ int RESULT::parse(MIOFILE& in) {
             continue;
         }
         if (parse_int(buf, "<app_version_num>", app_version_num)) continue;
+        if (parse_int(buf, "<slot>", slot)) continue;
         if (parse_double(buf, "<checkpoint_cpu_time>", checkpoint_cpu_time)) continue;
         if (parse_double(buf, "<current_cpu_time>", current_cpu_time)) continue;
         if (parse_double(buf, "<elapsed_time>", elapsed_time)) continue;
@@ -446,6 +447,7 @@ void RESULT::clear() {
     active_task = false;
     active_task_state = 0;
     app_version_num = 0;
+    slot = -1;
     checkpoint_cpu_time = 0;
     current_cpu_time = 0;
     fraction_done = 0;