logger avg fixup

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1778 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/common/Logger.cc b/trunk/ceph/common/Logger.cc
index 9ad4a85e94a0404df02227725a0c21f44fed2fd0..c21d57a1d015e9eb1442d5a6e31df556baa4e0a2 100644 (file)
--- a/trunk/ceph/common/Logger.cc
+++ b/trunk/ceph/common/Logger.cc
@@ -180,20 +180,16 @@ void Logger::_flush()
   
   // write line to log
   out << last_flush;
-  vector< vector<double> > to_avg(type->keys.size());
-  to_avg.swap(vals_to_avg);
   for (unsigned i=0; i<type->keys.size(); i++) {
     if (type->avg[i]) {
       if (vals[i] > 0) {
        double avg = (fvals[i] / (double)vals[i]);
-       //logger_lock.Unlock();
        double var = 0.0;
        if (g_conf.logger_calc_variance) {
          int n = vals[i];
-         for (vector<double>::iterator p = to_avg[i].begin(); n--; ++p) 
+         for (vector<double>::iterator p = vals_to_avg[i].begin(); n--; ++p) 
            var += (avg - *p) * (avg - *p);
        }
-       //logger_lock.Lock();
        out << "\t" << avg << "\t" << vals[i] << "\t" << var;
       } else
        out << "\t0\t0\t0";