diff --git a/checkin_notes b/checkin_notes index a61713dae0..37447e1fb0 100644 --- a/checkin_notes +++ b/checkin_notes @@ -561,3 +561,10 @@ David 6 Mar 2008 wrapper/ wrapper.C + +David 6 Mar 2008 + - Wrapper (Mac): use elapse wall time as CPU time; + there's no easy way to get another process's CPU time in Mac OS X + + wrapper/ + wrapper.C diff --git a/wrapper/wrapper.C b/wrapper/wrapper.C index 12958289a4..e3ec69c9f3 100644 --- a/wrapper/wrapper.C +++ b/wrapper/wrapper.C @@ -410,6 +410,10 @@ double TASK::cpu_time() { totTime = tKernel.QuadPart + tUser.QuadPart; return totTime / 1.e7; +#else if defined(__APPLE__) + // There's no easy way to get another process's CPU time in Mac OS X + // + return wall_cpu_time; #else return linux_cpu_time(pid); #endif