diff --git a/checkin_notes b/checkin_notes index 745461c1e9..ed74fd4a1d 100755 --- a/checkin_notes +++ b/checkin_notes @@ -5680,3 +5680,19 @@ Karl 2003/08/13 sched/ validate.C + +Karl 2003/08/13 + - applied FreeBSD patch & misc fixes + + configure.ac + m4/ + acx_pthread.m4 + client/ + hostinfo_unix.C + lib/ + filesys.C + shmem.C + + _autosetup + aclocal.m4 + diff --git a/client/app.C b/client/app.C index f1976a7687..6449290c33 100644 --- a/client/app.C +++ b/client/app.C @@ -1003,26 +1003,26 @@ int ACTIVE_TASK::get_cpu_time_via_shmem(time_t now) { parse_double(msg_buf, "", checkpoint_cpu_time); parse_double(msg_buf, "", working_set_size); - if (last_frac_update == 0) { - last_frac_update = now; - last_frac_done = fraction_done; - recent_change = 0; - } else { - recent_change += (fraction_done - last_frac_done); - int tdiff = now-last_frac_update; - if (tdiff>0) { - double recent_frac_rate_of_change = max(0, recent_change) / tdiff; - if (frac_rate_of_change == 0) { - frac_rate_of_change = recent_frac_rate_of_change; - } else { - double x = exp(-1*log(2.0)/20.0); - frac_rate_of_change = frac_rate_of_change*x + recent_frac_rate_of_change*(1-x); - } - last_frac_update = now; - last_frac_done = fraction_done; - recent_change = 0; - } - } + if (last_frac_update == 0) { + last_frac_update = now; + last_frac_done = fraction_done; + recent_change = 0; + } else { + recent_change += (fraction_done - last_frac_done); + int tdiff = now-last_frac_update; + if (tdiff>0) { + double recent_frac_rate_of_change = max(0.0, recent_change) / tdiff; + if (frac_rate_of_change == 0) { + frac_rate_of_change = recent_frac_rate_of_change; + } else { + double x = exp(-1*log(2.0)/20.0); + frac_rate_of_change = frac_rate_of_change*x + recent_frac_rate_of_change*(1-x); + } + last_frac_update = now; + last_frac_done = fraction_done; + recent_change = 0; + } + } return 0; }