From 9d55213996c67190d5a424265fda9a6005b7b50b Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Tue, 31 Aug 2010 10:35:42 +0000
Subject: [PATCH] client: fix problems with exclusive_gpu_app feature

svn path=/trunk/boinc/; revision=22310
---
 checkin_notes           | 9 +++++++++
 client/app.cpp          | 1 -
 client/client_state.cpp | 3 +++
 lib/procinfo_mac.cpp    | 4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 1b086b87e6..5f6352072e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6308,3 +6308,12 @@ David  29 Aug 2010
             login_action.php
             create_account_form.php
             create_account_action.php
+
+Charlie 31 Aug 2010
+    - client: fix problems with exclusive_gpu_app feature.
+    
+    client/
+        app.cpp
+        client_state.cpp
+    lib/
+        procinfo_mac.cpp
diff --git a/client/app.cpp b/client/app.cpp
index 93d33c01ac..c8ac814bc8 100644
--- a/client/app.cpp
+++ b/client/app.cpp
@@ -415,7 +415,6 @@ bool ACTIVE_TASK_SET::poll() {
     send_trickle_downs();
     graphics_poll();
     process_control_poll();
-    get_memory_usage();
     action |= check_rsc_limits_exceeded();
     get_msgs();
     for (i=0; i<active_tasks.size(); i++) {
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 44c3f2b5dc..70bf19184d 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -627,6 +627,9 @@ bool CLIENT_STATE::poll_slow_events() {
     }
 #endif
 
+    // active_tasks.get_memory_usage() sets variables needed by 
+    // check_suspend_processing(), so it must be called first.
+    active_tasks.get_memory_usage();
     suspend_reason = check_suspend_processing();
 
     // suspend or resume activities (but only if already did startup)
diff --git a/lib/procinfo_mac.cpp b/lib/procinfo_mac.cpp
index 5ad2384d30..70f8e989c9 100644
--- a/lib/procinfo_mac.cpp
+++ b/lib/procinfo_mac.cpp
@@ -102,14 +102,14 @@ int procinfo_setup(vector<PROCINFO>& pi) {
 
 
     fd = popen("ps -axcopid,ppid,rss,vsz,pagein,time,command", "r");
-    if (!fd) return 0;
+    if (!fd) return ERR_FOPEN;
 
     // Skip over the header line
     do {
         c = fgetc(fd);
         if (c == EOF) {
             pclose(fd);
-            return 0;
+            return ERR_GETS;
         }
     } while (c != '\n');