client: fix problems with exclusive_gpu_app feature

svn path=/trunk/boinc/; revision=22310
This commit is contained in:
Charlie Fenton 2010-08-31 10:35:42 +00:00
parent acb8d8ed0c
commit 9d55213996
4 changed files with 14 additions and 3 deletions

View File

@ -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

View File

@ -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++) {

View File

@ -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)

View File

@ -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');