diff --git a/checkin_notes b/checkin_notes index 40428ade3a..5a520b101a 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2583,4 +2583,9 @@ Charlie 7 Apr 2010 lib/ procinfo_mac.cpp - +David 7 Apr 2010 + - client: don't include graphics apps in non-BOINC CPU time (Unix). + + lib/ + procinfo_win.cpp + procinfo_unix.cpp diff --git a/lib/procinfo_unix.cpp b/lib/procinfo_unix.cpp index 9da763c230..6fbc178d7f 100644 --- a/lib/procinfo_unix.cpp +++ b/lib/procinfo_unix.cpp @@ -282,7 +282,9 @@ void add_child_totals(PROCINFO& pi, vector& piv, int pid, int rlvl) { // fill in the given PROCINFO (which initially is zero except for id) // with totals from that process and all its descendants // -void procinfo_app(PROCINFO& pi, vector& piv) { +void procinfo_app( + PROCINFO& pi, vector& piv, char* graphics_exec_file +) { unsigned int i; for (i=0; i& piv) { add_child_totals(pi, piv, pi.id, 0); return; } + if (!strcmp(p.command, graphics_exec_file)) { + p.is_boinc_app = true; + } } } diff --git a/lib/procinfo_win.cpp b/lib/procinfo_win.cpp index 6551d031e2..9e35845d69 100644 --- a/lib/procinfo_win.cpp +++ b/lib/procinfo_win.cpp @@ -137,7 +137,10 @@ int procinfo_setup(vector& pi) { // scan the process table from the given point, // adding in CPU time and mem usage // -void add_proc_totals(PROCINFO& pi, vector& piv, int pid, char* graphics_exec_file, int start) { +void add_proc_totals( + PROCINFO& pi, vector& piv, int pid, + char* graphics_exec_file, int start +) { unsigned int i; for (i=start; i