From f7008441b35d061cff8be900fbea8d8a87be72b1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 3 Dec 2009 13:20:00 -0800 Subject: [PATCH] logger: s64, not long So we can log larger numbers. --- src/common/Logger.cc | 12 ++++++------ src/common/Logger.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/Logger.cc b/src/common/Logger.cc index 381efc9d905fb..75183aa62b47d 100644 --- a/src/common/Logger.cc +++ b/src/common/Logger.cc @@ -239,14 +239,14 @@ void Logger::_flush() -long Logger::inc(int key, long v) +__s64 Logger::inc(int key, __s64 v) { if (!open || !g_conf.logger) return 0; logger_lock.Lock(); int i = type->lookup_key(key); vals[i] += v; - long r = vals[i]; + __s64 r = vals[i]; logger_lock.Unlock(); return r; } @@ -263,14 +263,14 @@ double Logger::finc(int key, double v) return r; } -long Logger::set(int key, long v) +__s64 Logger::set(int key, __s64 v) { if (!open || !g_conf.logger) return 0; logger_lock.Lock(); int i = type->lookup_key(key); //cout << this << " set " << i << " to " << v << std::endl; - long r = vals[i] = v; + __s64 r = vals[i] = v; logger_lock.Unlock(); return r; } @@ -302,13 +302,13 @@ double Logger::favg(int key, double v) return r; } -long Logger::get(int key) +__s64 Logger::get(int key) { if (!open || !g_conf.logger) return 0; logger_lock.Lock(); int i = type->lookup_key(key); - long r = 0; + __s64 r = 0; if (i >= 0 && i < (int)vals.size()) r = vals[i]; logger_lock.Unlock(); diff --git a/src/common/Logger.h b/src/common/Logger.h index b11d55255d5c5..771f20b1cac54 100644 --- a/src/common/Logger.h +++ b/src/common/Logger.h @@ -39,7 +39,7 @@ class Logger { bool open; // values for this instance - vector vals; + vector<__s64> vals; vector fvals; vector< vector > vals_to_avg; // for calculating variance @@ -60,9 +60,9 @@ class Logger { void _open_log(); - long inc(int f, long v = 1); - long set(int f, long v); - long get(int f); + __s64 inc(int f, __s64 v = 1); + __s64 set(int f, __s64 v); + __s64 get(int f); double fset(int f, double v); double finc(int f, double v); -- 2.39.5