From 86f50ba080cac9619034bf7114a99672075bb3f9 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 5 Apr 2012 11:01:38 +0000
Subject: [PATCH] - admin web: when resetting app statistics,     clear elapsed
 time stats as well as PFC stats

svn path=/trunk/boinc/; revision=25530
---
 checkin_notes           | 11 +++++++++++
 db/boinc_db.h           |  1 +
 html/ops/app_reset.php  |  2 +-
 sched/sched_version.cpp |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 9e1dbd844d..b56c8b9972 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3198,3 +3198,14 @@ David  2 Apr 2012
 
     lib/
         coproc.cpp
+
+David  5 Apr 2012
+    - admin web: when resetting app statistics,
+        clear elapsed time stats as well as PFC stats
+
+    db/
+        boinc_db.h
+    sched/
+        sched_version.cpp
+    html/ops/
+        app_reset.php
diff --git a/db/boinc_db.h b/db/boinc_db.h
index 9f9c82f4c3..1f982fa89d 100644
--- a/db/boinc_db.h
+++ b/db/boinc_db.h
@@ -709,6 +709,7 @@ struct HOST_APP_VERSION {
     int n_jobs_today;
     AVERAGE_VAR turnaround;
         // the stats of turnaround time (received - sent)
+        // (NOT normalized by wu.rsc_fpops_est)
     int consecutive_valid;
         // number of consecutive validated relicated results.
         // reset to zero on timeouts, errors, invalid
diff --git a/html/ops/app_reset.php b/html/ops/app_reset.php
index f90b1698aa..81de03ac13 100644
--- a/html/ops/app_reset.php
+++ b/html/ops/app_reset.php
@@ -34,7 +34,7 @@ if (!file_exists("../../stop_daemons")) {
 function reset_app($app) {
     $avs = BoincAppVersion::enum("appid=$app->id");
     foreach ($avs as $av) {
-        $av->update("pfc_n=0, pfc_avg=0, pfc_scale=0, expavg_credit=0, expavg_time=0");
+        $av->update("pfc_n=0, pfc_avg=0, pfc_scale=0, et_n=0, et_avg=0, et_var=0, et_q=0, expavg_credit=0, expavg_time=0");
         BoincHostAppVersion::update_aux("pfc_n=0, pfc_avg=0 where app_version_id=$av->id");
     }
     $app->update("min_avg_pfc = 0");
diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp
index 9f00dd167e..5bd3f4a87c 100644
--- a/sched/sched_version.cpp
+++ b/sched/sched_version.cpp
@@ -238,7 +238,7 @@ CLIENT_APP_VERSION* get_app_version_anonymous(
 
 #define ET_RATIO_LIMIT  10.
     // if the FLOPS estimate based on elapsed time
-    // exceeds project_flops by more than this factor, cap it.
+    // exceeds projected_flops by more than this factor, cap it.
     // The host may have received a bunch of short jobs recently
 
 // input: