From 55b9d48deb65ff34a3364154d41126aa2458896a Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 13 Sep 2011 05:54:55 +0000
Subject: [PATCH] - client, GUI RPC, Manager:     in GUI RPC, change
 RESULT.gpu_mem_wait to scheduler_wait.     It means that the app did a
 boinc_temporary_exit(),     and is waiting to be rescheduled.     GPU mem
 wait is one source of this, not the only one

svn path=/trunk/boinc/; revision=24176
---
 checkin_notes              | 15 +++++++++++++++
 client/client_types.cpp    |  2 +-
 clientgui/MainDocument.cpp |  4 ++--
 lib/gui_rpc_client.h       |  2 +-
 lib/gui_rpc_client_ops.cpp |  4 ++--
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 7785649f4a..b6d3de6cd4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5883,3 +5883,18 @@ David  12 Sept 2011
 
     sched/
         validator.cpp
+
+David  12 Sept 2011
+    - client, GUI RPC, Manager:
+        in GUI RPC, change RESULT.gpu_mem_wait to scheduler_wait.
+        It means that the app did a boinc_temporary_exit(),
+        and is waiting to be rescheduled.
+        GPU mem wait is one source of this, not the only one
+
+    clientgui/
+        MainDocument.cpp
+    lib/
+        gui_rpc_client.h
+        gui_rpc_client_ops.cpp
+    client/
+        client_types.cpp
diff --git a/client/client_types.cpp b/client/client_types.cpp
index 665d4d2b0a..ab6659d141 100644
--- a/client/client_types.cpp
+++ b/client/client_types.cpp
@@ -1895,7 +1895,7 @@ int RESULT::write_gui(MIOFILE& out) {
     if (report_immediately) out.printf("    <report_immediately/>\n");
     if (edf_scheduled) out.printf("    <edf_scheduled/>\n");
     if (coproc_missing) out.printf("    <coproc_missing/>\n");
-    if (schedule_backoff > gstate.now) out.printf("    <gpu_mem_wait/>\n");
+    if (schedule_backoff > gstate.now) out.printf("    <scheduler_wait/>\n");
     ACTIVE_TASK* atp = gstate.active_tasks.lookup_result(this);
     if (atp) {
         atp->write_gui(out);
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 6133a29677..51005b5281 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -2445,8 +2445,8 @@ wxString result_description(RESULT* result, bool show_resources) {
         } else {
             strBuffer += _("Ready to start");
         }
-        if (result->gpu_mem_wait) {
-            strBuffer += _(" (waiting for GPU memory)");
+        if (result->scheduler_wait) {
+            strBuffer += _(" (Scheduler wait)");
         }
         break;
     case RESULT_COMPUTE_ERROR:
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 6d1395d7c4..a8a276e5a3 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -252,7 +252,7 @@ public:
     bool suspended_via_gui;
     bool project_suspended_via_gui;
     bool coproc_missing;
-    bool gpu_mem_wait;
+    bool scheduler_wait;
 
     // the following defined if active
     bool active_task;
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 59daee3521..45af3fb3a6 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -490,7 +490,7 @@ int RESULT::parse(XML_PARSER& xp) {
         if (parse_bool(buf, "suspended_via_gui", suspended_via_gui)) continue;
         if (parse_bool(buf, "project_suspended_via_gui", project_suspended_via_gui)) continue;
         if (parse_bool(buf, "coproc_missing", coproc_missing)) continue;
-        if (parse_bool(buf, "gpu_mem_wait", gpu_mem_wait)) continue;
+        if (parse_bool(buf, "scheduler_wait", scheduler_wait)) continue;
         if (match_tag(buf, "<active_task>")) {
             active_task = true;
             continue;
@@ -553,7 +553,7 @@ void RESULT::clear() {
     suspended_via_gui = false;
     project_suspended_via_gui = false;
     coproc_missing = false;
-    gpu_mem_wait = false;
+    scheduler_wait = false;
 
     active_task = false;
     active_task_state = 0;