diff --git a/checkin_notes b/checkin_notes index 1782868729..d597e9f636 100755 --- a/checkin_notes +++ b/checkin_notes @@ -18692,3 +18692,11 @@ David 20 Oct 2004 app.C client_types.C cs_statefile.C + +David 20 Oct 2004 + - commented out frac_rate_of_change stuff + (too much complexity per unit value) + + client/ + app.C,h + app_control.C diff --git a/client/app.C b/client/app.C index 8d9953bdec..a120bf92f1 100644 --- a/client/app.C +++ b/client/app.C @@ -88,10 +88,12 @@ ACTIVE_TASK::ACTIVE_TASK() { graphics_mode_before_ss = MODE_HIDE_GRAPHICS; fraction_done = 0; +#if 0 frac_rate_of_change = 0; last_frac_done = 0; recent_change = 0; last_frac_update = 0; +#endif episode_start_cpu_time = 0; cpu_time_at_last_sched = 0; checkpoint_cpu_time = 0; @@ -225,6 +227,7 @@ int ACTIVE_TASK_SET::remove(ACTIVE_TASK* atp) { return ERR_NOT_FOUND; } +#if 0 // compute frac_rate_of_change // void ACTIVE_TASK::estimate_frac_rate_of_change(double now) { @@ -249,6 +252,7 @@ void ACTIVE_TASK::estimate_frac_rate_of_change(double now) { } } } +#endif // There's a new trickle file. // Move it from slot dir to project dir @@ -278,7 +282,7 @@ int ACTIVE_TASK::move_trickle_file() { // based on current reported CPU time and fraction done // double ACTIVE_TASK::est_cpu_time_to_completion() { - if (fraction_done <= 0 || fraction_done > 1 || frac_rate_of_change <= 0) { + if (fraction_done <= 0 || fraction_done > 1) { return -1; } return (current_cpu_time / fraction_done) - current_cpu_time; diff --git a/client/app.h b/client/app.h index eb6affdb1c..b7b2130afe 100644 --- a/client/app.h +++ b/client/app.h @@ -97,11 +97,13 @@ public: // App's estimate of how much of the work unit is done. // Passed from the application via an API call; // will be zero if the app doesn't use this call +#if 0 double frac_rate_of_change; // How much the percent done changes per second, // based on a recent exponential weighted average double last_frac_done, recent_change; double last_frac_update; +#endif double cpu_time_at_last_sched; // CPU time when CPU scheduler last ran double episode_start_cpu_time; diff --git a/client/app_control.C b/client/app_control.C index a278315360..6d11c847cd 100644 --- a/client/app_control.C +++ b/client/app_control.C @@ -869,7 +869,7 @@ bool ACTIVE_TASK_SET::get_msgs() { if (!atp->process_exists()) continue; old_time = atp->checkpoint_cpu_time; if (atp->get_app_status_msg()) { - atp->estimate_frac_rate_of_change(now); + //atp->estimate_frac_rate_of_change(now); if (old_time != atp->checkpoint_cpu_time) { action = true; }