ProfLogger: don't return val from inc/set/etc.

Nobody was using those return values.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/common/ProfLogger.cc b/src/common/ProfLogger.cc
index ac8ec2ff6617c72280b0d45c47966cabcb509919..58397157224e6b996a474f71e3b20e4af072ef60 100644 (file)
--- a/src/common/ProfLogger.cc
+++ b/src/common/ProfLogger.cc
@@ -364,67 +364,58 @@ void ProfLogger::_flush(bool need_reopen, bool need_reset, int last_flush)
 
 
 
-int64_t ProfLogger::inc(int key, int64_t v)
+void ProfLogger::inc(int key, int64_t v)
 {
   if (!cct->_conf->profiling_logger)
-    return 0;
+    return;
   lock->Lock();
   int i = type->lookup_key(key);
   vals[i] += v;
-  int64_t r = vals[i];
   lock->Unlock();
-  return r;
 }
 
-double ProfLogger::finc(int key, double v)
+void ProfLogger::finc(int key, double v)
 {
   if (!cct->_conf->profiling_logger)
-    return 0;
+    return;
   lock->Lock();
   int i = type->lookup_key(key);
   fvals[i] += v;
-  double r = fvals[i];
   lock->Unlock();
-  return r;
 }
 
-int64_t ProfLogger::set(int key, int64_t v)
+void ProfLogger::set(int key, int64_t v)
 {
   if (!cct->_conf->profiling_logger)
-    return 0;
+    return;
   lock->Lock();
   int i = type->lookup_key(key);
-  //cout << this << " set " << i << " to " << v << std::endl;
-  int64_t r = vals[i] = v;
+  vals[i] = v;
   lock->Unlock();
-  return r;
 }
 
 
-double ProfLogger::fset(int key, double v)
+void ProfLogger::fset(int key, double v)
 {
   if (!cct->_conf->profiling_logger)
-    return 0;
+    return;
   lock->Lock();
   int i = type->lookup_key(key);
-  //cout << this << " fset " << i << " to " << v << std::endl;
-  double r = fvals[i] = v;
+  fvals[i] = v;
   lock->Unlock();
-  return r;
 }
 
-double ProfLogger::favg(int key, double v)
+void ProfLogger::favg(int key, double v)
 {
   if (!cct->_conf->profiling_logger)
-    return 0;
+    return;
   lock->Lock();
   int i = type->lookup_key(key);
   vals[i]++;
-  double r = fvals[i] += v;
+  fvals[i] += v;
   if (cct->_conf->profiling_logger_calc_variance)
     vals_to_avg[i].push_back(v);
   lock->Unlock();
-  return r;
 }
 
 int64_t ProfLogger::get(int key)

diff --git a/src/common/ProfLogger.h b/src/common/ProfLogger.h
index d83a723f0e0c071c160da07a0ca1750e26d7ba3e..8d9bbc4762603a74f23eb0c5918bf73a1f032ee7 100644 (file)
--- a/src/common/ProfLogger.h
+++ b/src/common/ProfLogger.h
@@ -98,13 +98,13 @@ class ProfLogger {
     wrote_header_last(10000), lock(NULL) { }
   ~ProfLogger();
 
-  int64_t inc(int f, int64_t v = 1);
-  int64_t set(int f, int64_t v);
+  void inc(int f, int64_t v = 1);
+  void set(int f, int64_t v);
   int64_t get(int f);
 
-  double fset(int f, double v);
-  double finc(int f, double v);
-  double favg(int f, double v);
+  void fset(int f, double v);
+  void finc(int f, double v);
+  void favg(int f, double v);
 
   void _flush(bool need_reopen, bool need_reset, int last_flush);