From a47204f5e63ddefca669917ec6bfb2dfffcf9181 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 7 Aug 2009 09:22:02 +0000
Subject: [PATCH] client: More efficient implementation of active_only flag in
 get_results RPC

svn path=/trunk/boinc/; revision=18817
---
 checkin_notes           |  2 ++
 client/cs_statefile.cpp | 16 ++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 2beb6a9dba..3d7879bf8a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6758,6 +6758,8 @@ Charlie 3 Aug 2009
 
 Charlie 7 Aug 2009
     - MGR: Implement "Show active tasks / Show all tasks" button.
+    - client: More efficient implementation of active_only flag in 
+        get_results RPC.
     
     clientgui/
         AsyncRPC.cpp, .h
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index 1dd7eca603..fef562e346 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -874,13 +874,17 @@ int CLIENT_STATE::write_state_gui(MIOFILE& f) {
 
 int CLIENT_STATE::write_tasks_gui(MIOFILE& f, bool active_only) {
     unsigned int i;
-    
-    for (i=0; i<results.size(); i++) {
-        RESULT* rp = results[i];
-        if (active_only) {
-            if (!active_tasks.lookup_result(rp)) continue;
+
+    if (active_only) {
+        for (i=0; i<active_tasks.active_tasks.size(); i++) {
+            RESULT* rp = active_tasks.active_tasks[i]->result;
+            rp->write_gui(f);
+        }
+    } else {
+        for (i=0; i<results.size(); i++) {
+            RESULT* rp = results[i];
+            rp->write_gui(f);
         }
-        rp->write_gui(f);
     }
     return 0;
 }